[jbossws-commits] JBossWS SVN: r3966 - in trunk: integration/jboss40/src/main/resources and 10 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-07-23 09:02:36 -0400 (Mon, 23 Jul 2007) New Revision: 3966 Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java Log: Introduce DeploymentAspectManagerFactory SPI Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/JBossWS-Trunk.iws 2007-07-23 13:02:36 UTC (rev 3966) @@ -121,8 +121,8 @@ <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="56" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> - <option name="ENABLED" value="true" /> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="57" 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" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -147,7 +147,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="49" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -160,7 +160,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java" line="46" class="org.jboss.wsf.container.jboss50.DeploymentAspectManagerFactoryImpl" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -228,24 +228,80 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="jbossws-deployer-beans.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <file leaf-file-name="DeploymentAspectManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DeploymentAspectInstaller.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> + <file leaf-file-name="Deployment.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> + <state line="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="KernelAwareSPIFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SecurityAdaptorImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebXMLRewriterFactory.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TestDeployerJBoss.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SecurityAdaptorFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -660,9 +716,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> <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/metadata/webservices" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -698,9 +758,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -736,11 +800,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment" /> + <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> @@ -796,82 +860,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -912,6 +900,22 @@ <component name="RestoreUpdateTree" /> <component name="RunManager"> <activeType name="Remote" /> + <configuration selected="false" default="true" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <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="JUnit" factoryName="JUnit"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -940,22 +944,6 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> - <configuration selected="false" default="true" type="Application" factoryName="Application"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <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="true" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1029,21 +1017,21 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.31935883" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2651048" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.465063" 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" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.6884307" order="8" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5956472" order="8" /> <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.3162762" order="2" /> + <window_info id="Hierarchy" active="true" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3162762" 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" /> @@ -1119,119 +1107,111 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="60" selection-start="2361" selection-end="2361" vertical-scroll-proportion="0.33333334"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.299363"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="66" selection-start="1549" selection-end="1549" vertical-scroll-proportion="0.35714287"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="27" selection-start="1194" selection-end="1194" vertical-scroll-proportion="0.16666667"> + <state line="44" column="35" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.5714286"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Service.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="54" column="4" selection-start="1926" selection-end="1926" vertical-scroll-proportion="0.52380955"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="66" column="13" selection-start="2641" selection-end="2641" vertical-scroll-proportion="0.89575756"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Binding.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="49" selection-start="1557" selection-end="1557" vertical-scroll-proportion="0.3090909"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="31" column="17" selection-start="1255" selection-end="1255" vertical-scroll-proportion="0.26190478"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Dispatch.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> + <state line="35" column="43" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.35714287"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/BindingProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="24" selection-start="1291" selection-end="2750" vertical-scroll-proportion="0.9006211"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="170" column="67" selection-start="7011" selection-end="7011" vertical-scroll-proportion="0.7380952"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> <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="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jbosssx-client.jar!/org/jboss/security/SecurityAssociation.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.4093959"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2129" selection-end="2129" vertical-scroll-proportion="0.3416149"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="26" selection-start="2596" selection-end="2596" vertical-scroll-proportion="0.6787879"> + <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> + <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> <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/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> <folding /> </state> </provider> Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -39,7 +39,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -47,7 +46,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> @@ -55,7 +53,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -63,7 +60,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.DeploymentAspectManagerFactoryImpl \ No newline at end of file Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.framework.KernelAwareSPIFactory; +import org.jboss.logging.Logger; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class DeploymentAspectManagerFactoryImpl extends DeploymentAspectManagerFactory +{ + private static final Logger log = Logger.getLogger(DeploymentAspectManagerFactoryImpl.class); + + public DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType) + { + String beanName; + + if(deploymentType.toString().indexOf("EJB")!=-1) + beanName = "WSDeploymentAspectManagerEJB"; + else + beanName = "WSDeploymentAspectManagerJSE"; + + log.debug("DeploymentAspectManager for " + deploymentType +": " +beanName); + + return new KernelAwareSPIFactory().getKernelProvidedSPI( + beanName, DeploymentAspectManager.class + ); + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -39,7 +39,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -47,7 +46,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> @@ -55,7 +53,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -63,7 +60,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.DeploymentAspectManagerFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -34,6 +34,8 @@ * An abstract web service deployer. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com + * * @since 25-Apr-2007 */ public abstract class AbstractDeployerHook implements DeployerHook @@ -42,21 +44,19 @@ protected final Logger log = Logger.getLogger(getClass()); protected DeploymentAspectManager deploymentAspectManager; - private DeploymentModelFactory deploymentModelFactory; - public AbstractDeployerHook() + public void create() throws Exception { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); if(null == deploymentModelFactory) throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); - } - public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) - { - this.deploymentAspectManager = deploymentManager; + if(null == deploymentAspectManager) + throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); } public Deployment createDeployment() @@ -102,4 +102,8 @@ String name = unit.getName(); return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); } + + /** Get the deployment type this deployer can handle + */ + public abstract Deployment.DeploymentType getDeploymentType(); } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -58,9 +58,6 @@ */ public abstract class ArchiveDeployerHook extends AbstractDeployerHook { - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); /** Depending on the type of deployment, this method should return true * if the deployment contains web service endpoints. Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50; + +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.framework.KernelAwareSPIFactory; +import org.jboss.logging.Logger; + +/** + * A DeploymentAspectManagerFactory that retrieves a configured + * {@link DeploymentAspectManager} from MC kernel. + * + * @see org.jboss.wsf.framework.deployment.DeploymentAspectInstaller + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public class DeploymentAspectManagerFactoryImpl extends DeploymentAspectManagerFactory +{ + private static final Logger log = Logger.getLogger(DeploymentAspectManagerFactoryImpl.class); + + public DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType) + { + String beanName; + + if(deploymentType.toString().indexOf("EJB")!=-1) + beanName = "WSDeploymentAspectManagerEJB"; + else + beanName = "WSDeploymentAspectManagerJSE"; + + log.debug("DeploymentAspectManager for " + deploymentType +": " +beanName); + + return new KernelAwareSPIFactory().getKernelProvidedSPI( + beanName, DeploymentAspectManager.class + ); + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -69,7 +69,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -83,7 +82,6 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> @@ -97,7 +95,6 @@ <depends>WebServiceDeployerEJB</depends> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -111,7 +108,6 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.DeploymentAspectManagerFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -28,6 +28,7 @@ import org.jboss.wsf.spi.WSFException; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.invocation.InvocationModelFactory; import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; @@ -85,6 +86,10 @@ { returnType = (T) loadService(spiType, null); } + else if(DeploymentAspectManagerFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -22,8 +22,9 @@ package org.jboss.wsf.spi; /** - * Marks a specific subset onto the overall SPI. - * + * Marks a specific subset onto the overall SPI.<br> + * An SPIView can be passed to the {@link SPIProvider} to get an implementation. + * * @author Heiko.Braun(a)jboss.com * Created: Jul 18, 2007 */ Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +import org.jboss.wsf.spi.SPIView; + +/** + * Creates DeploymentAspectManager's by {@link org.jboss.wsf.spi.deployment.Deployment.DeploymentType} + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public abstract class DeploymentAspectManagerFactory implements SPIView +{ + public abstract DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF