Author: heiko.braun(a)jboss.com Date: 2007-07-19 12:09:08 -0400 (Thu, 19 Jul 2007) New Revision: 3955 Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java Modified: branches/hbraun/trunk/hbraun-trunk.iws branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjector.java Log: The SPIProvider should not rely on MC lookups Modified: branches/hbraun/trunk/hbraun-trunk.iws =================================================================== --- branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 16:09:08 UTC (rev 3955) @@ -200,10 +200,21 @@ </component> <component name="FileEditorManager"> <leaf> + <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="32" column="13" selection-start="1326" selection-end="1326" vertical-scroll-proportion="0.3057325"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="16" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.41463414"> + <state line="73" column="53" selection-start="2713" selection-end="2713" vertical-scroll-proportion="0.60254776"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -211,10 +222,10 @@ </provider> </entry> </file> - <file leaf-file-name="WebXMLRewriterImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> + <file leaf-file-name="DefaultInvocationHandlerJAXWS.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="30" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.34658384"> + <state line="81" column="62" selection-start="2735" selection-end="2735" vertical-scroll-proportion="0.522293"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -225,59 +236,46 @@ <file leaf-file-name="SPIProvider.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="27" selection-start="1189" selection-end="1189" vertical-scroll-proportion="0.2195122"> + <state line="34" column="25" selection-start="1264" selection-end="1264" vertical-scroll-proportion="0.35"> <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"> + <file leaf-file-name="SPIView.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="25" selection-start="1717" selection-end="1717" vertical-scroll-proportion="-1.8322982"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="29" column="17" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.225"> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AbstractDeployerHook.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <file leaf-file-name="WebAppDesciptorModifier.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="17" selection-start="1782" selection-end="1793" vertical-scroll-proportion="-0.46829268"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="34" column="40" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.28025478"> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InvocationModelFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <file leaf-file-name="ResourceInjectorFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.32298136"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="EndpointHandlerDeploymentAspect.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="135" column="124" selection-start="4570" selection-end="4826" vertical-scroll-proportion="0.8509317"> + <state line="31" column="36" selection-start="1265" selection-end="1265" vertical-scroll-proportion="0.275"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="EndpointRegistryFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> + <file leaf-file-name="ResourceInjectorFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="85" selection-start="1645" selection-end="1887" vertical-scroll-proportion="0.58536583"> - <folding /> + <state line="32" column="27" selection-start="1351" selection-end="1351" vertical-scroll-proportion="0.3057325"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> @@ -887,10 +885,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1079,8 +1073,8 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="true" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> + <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" /> @@ -1094,7 +1088,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.30086315" order="2" /> + <window_info id="Hierarchy" active="true" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.21824908" 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.49713632" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -1170,125 +1164,125 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="7" selection-start="1204" selection-end="1204" vertical-scroll-proportion="0.2682927"> + <state line="50" column="72" selection-start="1757" selection-end="1757" vertical-scroll-proportion="0.25605094"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjector.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="32" selection-start="1536" selection-end="1536" vertical-scroll-proportion="0.2682927"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="47" selection-start="1257" selection-end="1257" vertical-scroll-proportion="0.24390244"> + <state line="31" column="37" selection-start="1239" selection-end="1239" vertical-scroll-proportion="0.275"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="161" column="74" selection-start="8764" selection-end="8764" vertical-scroll-proportion="0.33096084"> + <state line="27" column="31" selection-start="1144" selection-end="1158" vertical-scroll-proportion="0.175"> <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="182" column="66" selection-start="7770" selection-end="7786" vertical-scroll-proportion="0.124223605"> + <state line="29" column="62" selection-start="1224" selection-end="1224" vertical-scroll-proportion="0.225"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="56" selection-start="1402" selection-end="1402" vertical-scroll-proportion="0.2682927"> - <folding /> + <state line="31" column="13" selection-start="1312" selection-end="1312" vertical-scroll-proportion="0.275"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="85" selection-start="1645" selection-end="1887" vertical-scroll-proportion="0.58536583"> + <state line="162" column="30" selection-start="8797" selection-end="8813" vertical-scroll-proportion="0.11847134"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="162" column="30" selection-start="8797" selection-end="8813" vertical-scroll-proportion="0.12969697"> + <state line="45" column="3" selection-start="1658" selection-end="1658" vertical-scroll-proportion="0.025477707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="16" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.41463414"> + <state line="32" column="13" selection-start="1326" selection-end="1326" vertical-scroll-proportion="0.3057325"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="30" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.34658384"> + <state line="32" column="27" selection-start="1351" selection-end="1351" vertical-scroll-proportion="0.3057325"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvider.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="27" selection-start="1189" selection-end="1189" vertical-scroll-proportion="0.2195122"> + <state line="31" column="36" selection-start="1265" selection-end="1265" vertical-scroll-proportion="0.275"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="25" selection-start="1717" selection-end="1717" vertical-scroll-proportion="-1.8322982"> + <state line="81" column="62" selection-start="2735" selection-end="2735" vertical-scroll-proportion="0.522293"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="17" selection-start="1782" selection-end="1793" vertical-scroll-proportion="-0.46829268"> + <state line="73" column="53" selection-start="2713" selection-end="2713" vertical-scroll-proportion="0.60254776"> <folding> <element signature="imports" expanded="true" /> </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/spi/src/main/java/org/jboss/wsf/spi/SPIProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.32298136"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="34" column="25" selection-start="1264" selection-end="1264" vertical-scroll-proportion="0.35"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="135" column="124" selection-start="4570" selection-end="4826" vertical-scroll-proportion="0.8509317"> + <state line="34" column="40" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.28025478"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="17" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.225"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -21,23 +21,18 @@ */ package org.jboss.wsf.framework; -import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.logging.Logger; +import org.jboss.wsf.common.ServiceLoader; +import org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl; +import org.jboss.wsf.framework.deployment.WebXMLRewriterFactoryImpl; +import org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl; import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; -import org.jboss.wsf.spi.invocation.ResourceInjector; -import org.jboss.wsf.framework.invocation.WebServiceContextInjector; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.WebXMLRewriter; -import org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl; -import org.jboss.wsf.framework.deployment.WebXMLRewriterImpl; -import org.jboss.wsf.common.ServiceLoader; -import org.jboss.logging.Logger; -import org.jboss.kernel.Kernel; -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.deployment.WebXMLRewriterFactory; +import org.jboss.wsf.spi.invocation.InvocationModelFactory; +import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; /** * @author Heiko.Braun(a)jboss.com @@ -72,13 +67,13 @@ { returnType = (T)new DeploymentModelFactoryImpl(); } - else if (spiType.equals(ResourceInjector.class)) + else if (spiType.equals(ResourceInjectorFactory.class)) { - returnType = (T) new WebServiceContextInjector(); + returnType = (T) new ResourceInjectorFactoryImpl(); } - else if(spiType.equals(WebXMLRewriter.class)) + else if(spiType.equals(WebXMLRewriterFactory.class)) { - returnType = getKernelProvidedSPI("WSWebXMLRewriter", spiType); + returnType = (T) new WebXMLRewriterFactoryImpl(); } // SPI provided by either container or stack integration @@ -103,15 +98,5 @@ return returnType; } - - private <T> T getKernelProvidedSPI(String beanName, Class<T> spiType) - { - log.debug("Querying for MC Kernel provided SPI: beanName="+ beanName + ", type="+spiType); - - Kernel kernel = KernelLocator.getKernel(); - KernelRegistry registry = kernel.getRegistry(); - KernelRegistryEntry entry = registry.getEntry(beanName); - return (T)entry.getTarget(); - } } } Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -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.framework; + +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class KernelAwareSPIFactory +{ + public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact) + { + Kernel kernel = KernelLocator.getKernel(); + KernelRegistry registry = kernel.getRegistry(); + KernelRegistryEntry entry = registry.getEntry(beanName); + return (T)entry.getTarget(); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -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.framework.deployment; + +import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; +import org.jboss.wsf.spi.deployment.WebXMLRewriter; +import org.jboss.wsf.framework.KernelAwareSPIFactory; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class WebXMLRewriterFactoryImpl extends WebXMLRewriterFactory +{ + public WebXMLRewriter createWebXMLRewriter() + { + WebXMLRewriter rewriter = new KernelAwareSPIFactory().getKernelProvidedSPI( + "WSWebXMLRewriter", WebXMLRewriter.class + ); + + return rewriter; + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -46,6 +46,11 @@ { private WebAppDesciptorModifier desciptorModifier; + public WebXMLRewriterImpl() + { + this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl(); + } + public WebAppDesciptorModifier getDesciptorModifier() { return desciptorModifier; Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.invocation; + +import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; +import org.jboss.wsf.spi.invocation.ResourceInjector; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class ResourceInjectorFactoryImpl extends ResourceInjectorFactory +{ + public ResourceInjector createResourceInjector() + { + return new WebServiceContextInjector(); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/ResourceInjectorFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -43,6 +43,10 @@ // provide logging private static Logger log = Logger.getLogger(WebServiceContextInjector.class); + WebServiceContextInjector() + { + } + public void inject(Object instance, WebServiceContext context) { try Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 19-May-2007 */ -public interface WebAppDesciptorModifier extends SPIView +public interface WebAppDesciptorModifier { final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -21,14 +21,11 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.SPIView; - /** * @author Heiko.Braun(a)jboss.com * Created: Jul 19, 2007 */ -public interface WebXMLRewriter extends SPIView +public interface WebXMLRewriter { RewriteResults rewriteWebXml(Deployment dep); } Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -0,0 +1,33 @@ +/* + * 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; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public abstract class WebXMLRewriterFactory implements SPIView +{ + public abstract WebXMLRewriter createWebXMLRewriter(); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -79,7 +79,8 @@ if (wsContext != null) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ResourceInjector injector = spiProvider.getSPI(ResourceInjector.class); + ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class); + ResourceInjector injector = factory.createResourceInjector(); injector.inject(targetBean, wsContext); } Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjector.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjector.java 2007-07-19 15:40:26 UTC (rev 3954) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjector.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -29,7 +29,7 @@ * @author Heiko.Braun(a)jboss.com * Created: Jul 19, 2007 */ -public abstract class ResourceInjector implements SPIView +public abstract class ResourceInjector { public abstract void inject(Object instance, WebServiceContext context); } Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java 2007-07-19 16:09:08 UTC (rev 3955) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.invocation; + +import org.jboss.wsf.spi.SPIView; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public abstract class ResourceInjectorFactory implements SPIView +{ + public abstract ResourceInjector createResourceInjector(); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ResourceInjectorFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF