[jbossws-commits] JBossWS SVN: r3969 - in trunk: integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services and 26 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jul 24 03:41:52 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-07-24 03:41:51 -0400 (Tue, 24 Jul 2007)
New Revision: 3969
Added:
trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.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/EndpointResolver.java
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
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java
trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java
trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/native/int-native.iml
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java
trunk/integration/sunri/int-sunri.iml
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java
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/ManagedEndpointRegistry.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/jaxrpc/client/ServiceReferenceable.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
Log:
Provide EndpointRegistry and ServerConfig through SPIProvider
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 07:41:51 UTC (rev 3969)
@@ -121,7 +121,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="59" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
+ <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
<option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -228,15 +228,24 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="LifecycleHandler.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java">
+ <file leaf-file-name="EndpointServlet.java" pinned="false" current="false" current-in-tab="false">
+ <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="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524">
+ <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="jbossws-sunri-config.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -268,8 +277,8 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-40" />
- <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">
@@ -410,44 +419,16 @@
<option name="myItemId" value="jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="wsf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="stack" />
+ <option name="myItemId" value="framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xfire" />
+ <option name="myItemId" value="management" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
@@ -457,20 +438,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</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.PackageViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
@@ -478,99 +449,7 @@
<option name="myItemId" value="jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="stack" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="sunri" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="stack" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbws" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-50" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-50" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="container" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss50" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
@@ -676,10 +555,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -702,22 +577,6 @@
<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>
<PATH>
<PATH_ELEMENT>
@@ -725,41 +584,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="spi" />
+ <option name="myItemId" value="int-native" />
<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/invocation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -767,41 +594,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="spi" />
+ <option name="myItemId" value="int-native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
<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/deployment" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -809,37 +608,17 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="spi" />
+ <option name="myItemId" value="int-native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -847,41 +626,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="spi" />
+ <option name="myItemId" value="int-native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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>
- <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>
@@ -889,52 +648,30 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="spi" />
+ <option name="myItemId" value="int-native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/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="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws" />
<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>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -968,6 +705,7 @@
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.spi.management" />
<recent name="org.jboss.wsf.framework.deployment" />
<recent name="org.jboss.wsf.framework" />
</key>
@@ -975,22 +713,6 @@
<component name="RestoreUpdateTree" />
<component name="RunManager">
<activeType name="Remote" />
- <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- </configuration>
<configuration selected="false" default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -1000,13 +722,6 @@
<option name="ALTERNATIVE_JRE_PATH" />
<module name="" />
</configuration>
- <configuration selected="false" default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1019,6 +734,29 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration selected="false" default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ </configuration>
<configuration selected="true" default="false" name="server" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1096,8 +834,8 @@
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.32737362" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.43871707" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" 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" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
@@ -1106,7 +844,7 @@
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.21393341" order="2" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23551172" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
@@ -1182,99 +920,113 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="26" selection-start="1665" selection-end="1665" vertical-scroll-proportion="1.0518292">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="108" column="15" selection-start="4477" selection-end="4477" vertical-scroll-proportion="0.35776398">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml">
+ <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="93" column="91" selection-start="4099" selection-end="4099" vertical-scroll-proportion="0.33231708">
+ <state line="69" column="94" selection-start="2985" selection-end="2985" vertical-scroll-proportion="0.60121953">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="92" column="91" selection-start="4061" selection-end="4061" vertical-scroll-proportion="0.33231708">
+ <state line="304" column="104" selection-start="12676" selection-end="12676" vertical-scroll-proportion="0.3416149">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="146" column="91" selection-start="5639" selection-end="5639" vertical-scroll-proportion="0.33231708">
+ <state line="93" column="19" selection-start="3382" selection-end="3382" vertical-scroll-proportion="0.58536583">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="97" selection-start="3430" selection-end="3430" vertical-scroll-proportion="0.33231708">
+ <state line="96" column="22" selection-start="3479" selection-end="3479" vertical-scroll-proportion="0.63414633">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="61" selection-start="3777" selection-end="3777" vertical-scroll-proportion="0.27134147">
+ <state line="70" column="4" selection-start="2767" selection-end="2767" vertical-scroll-proportion="-0.9689441">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="105" selection-start="3605" selection-end="3605" vertical-scroll-proportion="0.14939025">
+ <state line="59" column="14" selection-start="1776" selection-end="2413" vertical-scroll-proportion="-0.39130434">
<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">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0">
+ <state line="38" column="1" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.34146342">
<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$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0">
+ <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="0.34146342">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
+ <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="77" column="61" selection-start="4154" selection-end="4154" vertical-scroll-proportion="0.36091954">
+ <state line="61" column="41" selection-start="2210" selection-end="2210" vertical-scroll-proportion="0.9268293">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="36" column="13" selection-start="1441" selection-end="1441" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="61" selection-start="2264" selection-end="2264" vertical-scroll-proportion="0.22424242">
+ <state line="36" column="13" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/IntegrationIssues.txt">
+ <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-common-core.jar!/org/jboss/util/NotImplementedException.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="5" column="13" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0952381">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java">
+ <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="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524">
+ <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Modified: trunk/integration/native/int-native.iml
===================================================================
--- trunk/integration/native/int-native.iml 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/native/int-native.iml 2007-07-24 07:41:51 UTC (rev 3969)
@@ -11,6 +11,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jbossws-core" />
<orderEntry type="module" module-name="spi" />
+ <orderEntry type="library" name="jboss-logging-spi" level="project" />
<orderEntryProperties />
</component>
</module>
Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.jbws;
+
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.framework.KernelAwareSPIFactory;
+
+/**
+ * An EndpointRegistryFactory implementation that retrieves
+ * the registry from MC kernel.
+ *
+ * @see EndpointRegistry.BEAN_NAME
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 23, 2007
+ */
+public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
+{
+ public EndpointRegistry createEndpointRegistry()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ EndpointRegistry.BEAN_NAME, EndpointRegistry.class
+ );
+ }
+}
Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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 07:39:54 UTC (rev 3968)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -34,7 +34,7 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.management.BasicEndpointRegistry;
+import org.jboss.wsf.spi.management.DefaultEndpointRegistry;
/**
* A Service Endpoint Registry
@@ -42,7 +42,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-May-2007
*/
-public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean
+public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean
{
// provide logging
private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class);
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -88,6 +88,8 @@
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Document;
@@ -524,8 +526,8 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
wsdlHost = config.getWebServiceHost();
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -50,6 +50,8 @@
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.IOUtils;
import org.w3c.dom.Document;
@@ -239,7 +241,8 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (udi.parent != null ? udi.parent.simpleName : udi.simpleName);
- ServerConfig config = ServerConfigFactory.getInstance().getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -293,7 +296,8 @@
File locationFile = null;
if (predefinedLocation == false)
{
- ServerConfig config = ServerConfigFactory.getInstance().getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
}
else
Added: trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -39,6 +39,8 @@
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* IO utilites
@@ -123,9 +125,10 @@
try
{
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ // TODO: recursive dependency, ohoh
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws");
tmpdir.mkdirs();
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -26,6 +26,8 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
@@ -100,10 +102,16 @@
}
else if(RequestHandlerFactory.class.equals(spiType))
{
- returnType = (T) loadService(
- spiType, null
- );
+ returnType = (T) loadService(spiType, null);
}
+ else if(EndpointRegistryFactory.class.equals(spiType))
+ {
+ returnType = (T) loadService(spiType, null);
+ }
+ else if(ServerConfigFactory.class.equals(spiType))
+ {
+ returnType = (T) loadService(spiType, null);
+ }
// help debugging
if(null == returnType)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -26,6 +26,8 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* A deployer that registers the endpoints
@@ -37,7 +39,8 @@
{
public void create(Deployment dep)
{
- EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
for (Endpoint ep : dep.getService().getEndpoints())
{
registry.register(ep);
@@ -46,7 +49,9 @@
public void destroy(Deployment dep)
{
- EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+
for (Endpoint ep : dep.getService().getEndpoints())
{
registry.unregister(ep);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -41,6 +41,8 @@
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* A deployer that generates a webapp for an EJB endpoint
@@ -88,7 +90,9 @@
File tmpWar = null;
try
{
- ServerConfig config = ServerConfigFactory.getInstance().getServerConfig();
+ // TODO: recursive dependency, ohoh
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
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 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -40,6 +40,8 @@
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;
/**
@@ -57,7 +59,8 @@
public void init(ServletConfig servletConfig) throws ServletException
{
super.init(servletConfig);
- epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -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.management;
-
-// $Id$
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-
-/**
- * A general endpoint registry.
- *
- * @author Thomas.Diesler at jboss.com
- * @since 20-Apr-2007
- */
-public class BasicEndpointRegistry implements EndpointRegistry
-{
- // provide logging
- private static final Logger log = Logger.getLogger(BasicEndpointRegistry.class);
-
- private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>();
-
- public Endpoint getEndpoint(ObjectName epName)
- {
- if (epName == null)
- throw new IllegalArgumentException("Endpoint name cannot be null");
-
- if (isRegistered(epName) == false)
- throw new IllegalStateException("Endpoint not registered: " + epName);
-
- Endpoint endpoint = endpoints.get(epName);
- return endpoint;
- }
-
- public Endpoint resolvePortComponentLink(String pcLink)
- {
- throw new NotImplementedException();
- }
-
- public boolean isRegistered(ObjectName epName)
- {
- if (epName == null)
- throw new IllegalArgumentException("Endpoint name cannot be null");
-
- return endpoints.get(epName) != null;
- }
-
- public Set<ObjectName> getEndpoints()
- {
- return endpoints.keySet();
- }
-
- public void register(Endpoint endpoint)
- {
- if (endpoint == null)
- throw new IllegalArgumentException("Endpoint cannot be null");
-
- ObjectName epName = endpoint.getName();
- if (epName == null)
- throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint);
-
- if (isRegistered(epName))
- throw new IllegalStateException("Endpoint already registered: " + epName);
-
- log.info("register: " + epName);
- endpoints.put(epName, endpoint);
- }
-
- public void unregister(Endpoint endpoint)
- {
- if (endpoint == null)
- throw new IllegalArgumentException("Endpoint cannot be null");
-
- ObjectName epName = endpoint.getName();
- if (isRegistered(epName) == false)
- throw new IllegalStateException("Endpoint not registered: " + epName);
-
- log.info("remove: " + epName);
- endpoints.remove(epName);
- }
-}
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,40 @@
+/*
+ * 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.management;
+
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.framework.KernelAwareSPIFactory;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 23, 2007
+ */
+public class ServerConfigFactoryImpl extends ServerConfigFactory
+{
+ public ServerConfig createServerConfig()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ ServerConfig.BEAN_NAME, ServerConfig.class
+ );
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -30,6 +30,8 @@
import org.jboss.wsf.spi.invocation.RequestHandler;
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 javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
@@ -123,7 +125,9 @@
protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException
{
- EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+
Endpoint endpoint = getEndpointForDestination(epRegistry, fromName);
if (endpoint == null)
Added: 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 (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,106 @@
+/*
+ * 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;
+
+// $Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+
+import javax.management.ObjectName;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A general endpoint registry.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 20-Apr-2007
+ */
+public class DefaultEndpointRegistry implements EndpointRegistry
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(DefaultEndpointRegistry.class);
+
+ private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>();
+
+ public Endpoint getEndpoint(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ Endpoint endpoint = endpoints.get(epName);
+ return endpoint;
+ }
+
+ public Endpoint resolvePortComponentLink(String pcLink)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public boolean isRegistered(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ return endpoints.get(epName) != null;
+ }
+
+ public Set<ObjectName> getEndpoints()
+ {
+ return endpoints.keySet();
+ }
+
+ public void register(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (epName == null)
+ throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint);
+
+ if (isRegistered(epName))
+ throw new IllegalStateException("Endpoint already registered: " + epName);
+
+ log.info("register: " + epName);
+ endpoints.put(epName, endpoint);
+ }
+
+ public void unregister(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ log.info("remove: " + epName);
+ endpoints.remove(epName);
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -27,6 +27,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.ws.integration.KernelLocator;
+import org.jboss.wsf.spi.SPIView;
/**
* Get the endpoint registry from the kernel
@@ -34,19 +35,7 @@
* @author Thomas.Diesler at jboss.com
* @since 20-Apr-2007
*/
-public class EndpointRegistryFactory
+public abstract class EndpointRegistryFactory implements SPIView
{
- private static EndpointRegistry epRegistry;
-
- public static EndpointRegistry getEndpointRegistry()
- {
- if (epRegistry == null)
- {
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry(EndpointRegistry.BEAN_NAME);
- epRegistry = (EndpointRegistry)entry.getTarget();
- }
- return epRegistry;
- }
+ public abstract EndpointRegistry createEndpointRegistry();
}
Added: 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 (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,34 @@
+/*
+ * 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 interface EndpointResolver
+{
+ Endpoint getResult();
+ void setResult(Endpoint result);
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,54 @@
+/*
+ * 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;
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.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);
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -24,35 +24,17 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.logging.Logger;
import org.jboss.ws.integration.KernelLocator;
+import org.jboss.wsf.spi.SPIView;
// $Id$
/**
* Factory to container independent config
*
- * @author Thomas.Diesler at jboss.org
+ * @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public class ServerConfigFactory
+public abstract class ServerConfigFactory implements SPIView
{
- // provide logging
- private static final Logger log = Logger.getLogger(ServerConfigFactory.class);
-
- private static ServerConfigFactory instance = new ServerConfigFactory();
-
- // Hide ctor
- protected ServerConfigFactory()
- {
- }
-
- public static ServerConfigFactory getInstance()
- {
- return instance;
- }
-
- public ServerConfig getServerConfig()
- {
- KernelRegistry registry = KernelLocator.getKernel().getRegistry();
- return (ServerConfig)registry.getEntry(ServerConfig.BEAN_NAME).getTarget();
- }
+ public abstract ServerConfig createServerConfig();
}
Modified: trunk/integration/sunri/int-sunri.iml
===================================================================
--- trunk/integration/sunri/int-sunri.iml 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/sunri/int-sunri.iml 2007-07-24 07:41:51 UTC (rev 3969)
@@ -199,6 +199,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="jboss-logging-spi" level="project" />
<orderEntryProperties />
</component>
</module>
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.sunri;
+
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.framework.KernelAwareSPIFactory;
+
+/**
+ * An EndpointRegistryFactory implementation that retrieves
+ * the registry from MC kernel.
+ *
+ * @see EndpointRegistry.BEAN_NAME
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 23, 2007
+ */
+public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
+{
+ public EndpointRegistry createEndpointRegistry()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ EndpointRegistry.BEAN_NAME, EndpointRegistry.class
+ );
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -29,7 +29,7 @@
import javax.management.MBeanServerFactory;
import org.jboss.logging.Logger;
-import org.jboss.wsf.framework.management.BasicEndpointRegistry;
+import org.jboss.wsf.spi.management.DefaultEndpointRegistry;
/**
* A Service Endpoint Registry
@@ -37,7 +37,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-May-2007
*/
-public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean
+public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean
{
// provide logging
private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class);
Added: trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.sunri.EndpointRegistryFactoryImpl
\ No newline at end of file
Modified: trunk/integration/xfire/int-xfire.iml
===================================================================
--- trunk/integration/xfire/int-xfire.iml 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/xfire/int-xfire.iml 2007-07-24 07:41:51 UTC (rev 3969)
@@ -8,8 +8,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="commons-logging" level="project" />
<orderEntry type="module" module-name="spi" />
+ <orderEntry type="library" name="jboss-logging-spi" level="project" />
<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 07:39:54 UTC (rev 3968)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -45,6 +45,8 @@
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.SPIProvider;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@@ -71,7 +73,8 @@
super.init(servletConfig);
// Init the Endpoint
- epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
String contextPath = servletConfig.getServletContext().getContextPath();
endpoint = initServiceEndpoint(contextPath);
endpoint.addAttachment(ServletController.class, getController());
Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java (rev 0)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.xfire;
+
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.framework.KernelAwareSPIFactory;
+
+/**
+ * An EndpointRegistryFactory implementation that retrieves
+ * the registry from MC kernel.
+ *
+ * @see EndpointRegistry.BEAN_NAME
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 23, 2007
+ */
+public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
+{
+ public EndpointRegistry createEndpointRegistry()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ EndpointRegistry.BEAN_NAME, EndpointRegistry.class
+ );
+ }
+}
Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -29,7 +29,7 @@
import javax.management.MBeanServerFactory;
import org.jboss.logging.Logger;
-import org.jboss.wsf.framework.management.BasicEndpointRegistry;
+import org.jboss.wsf.spi.management.DefaultEndpointRegistry;
/**
* A Service Endpoint Registry
@@ -37,7 +37,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-May-2007
*/
-public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean
+public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean
{
// provide logging
private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class);
Added: trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.xfire.EndpointRegistryFactoryImpl
\ No newline at end of file
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 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -64,6 +64,8 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.SPIProvider;
/**
* This ServiceObjectFactory reconstructs a javax.xml.rpc.Service
@@ -182,7 +184,8 @@
String endpointAddress = null;
try
{
- EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink);
if (endpoint == null)
throw new WSException("Cannot resolve port-component-link: " + pcLink);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -27,6 +27,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
+import java.io.File;
import java.net.URL;
import javax.naming.BinaryRefAddr;
@@ -43,6 +44,8 @@
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* A JNDI reference to a javax.xml.rpc.Service
@@ -57,7 +60,7 @@
{
// provide logging
private static Logger log = Logger.getLogger(ServiceReferenceable.class);
-
+
public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA";
public static final String SECURITY_CONFIG = "SECURITY_CONFIG";
public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK";
@@ -101,8 +104,9 @@
myRef.add(new StringRefAddr(PORT_COMPONENT_LINK, pcLink));
try
{
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
+
String host = config.getWebServiceHost();
int port = config.getWebServicePort();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -30,6 +30,7 @@
import java.util.Map;
import java.util.StringTokenizer;
import java.util.concurrent.Executor;
+import java.io.File;
import javax.xml.transform.Source;
import javax.xml.ws.Binding;
@@ -44,6 +45,9 @@
import org.jboss.ws.core.server.HttpContext;
import org.jboss.ws.core.server.HttpServer;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.w3c.dom.Element;
/**
@@ -151,8 +155,8 @@
boolean isStandalone;
try
{
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir();
isStandalone = false;
}
catch (Exception ex)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -41,6 +41,8 @@
import org.jboss.wsf.spi.management.EndpointMetrics;
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;
/**
* The servlet that that is associated with context /jbossws
@@ -58,7 +60,8 @@
public void init(ServletConfig config) throws ServletException
{
super.init(config);
- epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
}
/** Process GET requests.
@@ -151,7 +154,7 @@
writer.print("</table>");
writer.print("");
}
-
+
writer.print(" </td>");
writer.print("</tr>");
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 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -38,6 +38,8 @@
import org.jboss.wsf.spi.deployment.Endpoint;
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;
/**
* A servlet that reports the serviceURL for a given service ID.
@@ -64,7 +66,8 @@
public void init(ServletConfig config) throws ServletException
{
super.init(config);
- epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
}
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -24,6 +24,7 @@
// $Id$
import java.io.IOException;
+import java.io.File;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -76,6 +77,8 @@
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.common.ObjectNameFactory;
/** An abstract meta data builder.
@@ -216,8 +219,9 @@
if (uriScheme == null)
uriScheme = "http";
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
+
String host = config.getWebServiceHost();
int port = config.getWebServicePort();
if ("https".equals(uriScheme))
@@ -297,8 +301,8 @@
String servicePath = sepMetaData.getContextRoot() + sepMetaData.getURLPattern();
String serviceEndpointURL = getServiceEndpointAddress(uriScheme, servicePath);
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
boolean alwaysModify = config.isModifySOAPAddress();
if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -58,6 +58,8 @@
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* Util class that deals with XML Schema
@@ -518,8 +520,8 @@
File tmpdir = null;
try
{
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = factory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir();
tmpdir = serverConfig.getServerTempDir();
tmpdir = new File(tmpdir.getCanonicalPath() + "/jbossws");
tmpdir.mkdirs();
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -31,6 +31,8 @@
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
*
@@ -42,8 +44,8 @@
public void testAddress(final String archive, final String service, final String scheme, final String port)
{
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
File dataDir = serverConfig.getServerDataDir();
File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -30,8 +30,10 @@
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
-/**
+/**
* @author darran.lofthouse at jboss.com
* @since 21-September-2006
*/
@@ -46,9 +48,8 @@
try
{
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
- File tmpDir = serverConfig.getServerTempDir();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir();
tmpDir = new File(tmpDir.getCanonicalPath() + "/jbossws");
baseFiles = getXsdTempFiles(tmpDir);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969)
@@ -33,6 +33,8 @@
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
@@ -48,9 +50,9 @@
public void testAddress(final String archive, final String service, final String scheme, final String port)
{
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
-
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir();
+
File dataDir = serverConfig.getServerDataDir();
File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
More information about the jbossws-commits
mailing list