Author: heiko.braun(a)jboss.com Date: 2007-07-19 11:40:26 -0400 (Thu, 19 Jul 2007) New Revision: 3954 Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.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/spi/deployment/RewriteResults.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 Removed: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java Modified: branches/hbraun/trunk/hbraun-trunk.iws branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java Log: Introduce WbeXMLRewriter as SPIView Modified: branches/hbraun/trunk/hbraun-trunk.iws =================================================================== --- branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 15:40:26 UTC (rev 3954) @@ -200,19 +200,41 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="WebServiceContextEJB.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> + <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="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> + <state line="80" column="16" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.41463414"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </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"> + <provider selected="true" editor-type-id="text-editor"> + <state line="34" column="30" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.34658384"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <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"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ServiceEndpointInvoker.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> + <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="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <state line="37" column="25" selection-start="1717" selection-end="1717" vertical-scroll-proportion="-1.8322982"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -220,10 +242,10 @@ </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"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <state line="49" column="17" selection-start="1782" selection-end="1793" vertical-scroll-proportion="-0.46829268"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -231,10 +253,10 @@ </provider> </entry> </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <file leaf-file-name="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"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.32298136"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -242,6 +264,24 @@ </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"> + <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"> + <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> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -710,6 +750,140 @@ <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> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <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> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <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/deployment" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <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/ws" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -779,11 +953,11 @@ <recent name="org.jboss.test.ws.jaxws.webserviceref" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.deployment" /> <recent name="org.jboss.wsf.spi.invocation" /> <recent name="org.jboss.wsf.framework.invocation" /> <recent name="org.jboss.wsf.stack.jbws" /> <recent name="org.jboss.wsf.container.jboss50" /> - <recent name="org.jboss.wsf.common.log" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -910,8 +1084,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="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.27928483" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.44673538" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3458693" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.56930125" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24969174" 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" /> @@ -920,7 +1094,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.21763255" 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="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" /> @@ -996,131 +1170,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/invocation/DefaultInvocationHandlerJAXWS.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="20" selection-start="2777" selection-end="2777" vertical-scroll-proportion="0.85365856"> + <state line="31" column="7" selection-start="1204" selection-end="1204" vertical-scroll-proportion="0.2682927"> <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/InvocationContext.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="61" column="15" selection-start="1508" selection-end="1807" vertical-scroll-proportion="1.6619385"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="22" selection-start="1763" selection-end="1763" vertical-scroll-proportion="0.31707317"> + <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/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/deployment/WebXMLRewriter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="125" column="12" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.45341614"> + <state line="30" column="47" selection-start="1257" selection-end="1257" vertical-scroll-proportion="0.24390244"> <folding> <element signature="imports" expanded="true" /> </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$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="57" selection-start="1272" selection-end="1272" vertical-scroll-proportion="0.2682927"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="161" column="74" selection-start="8764" selection-end="8764" vertical-scroll-proportion="0.33096084"> + <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/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> <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="182" column="66" selection-start="7770" selection-end="7786" vertical-scroll-proportion="0.124223605"> + <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/deployment/WebAppDesciptorModifier.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="131" column="57" selection-start="5156" selection-end="5156" vertical-scroll-proportion="0.5031056"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="34" column="56" selection-start="1402" selection-end="1402" vertical-scroll-proportion="0.2682927"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> + <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="43" column="22" selection-start="1724" selection-end="1724" vertical-scroll-proportion="0.14634146"> + <state line="47" column="85" selection-start="1645" selection-end="1887" vertical-scroll-proportion="0.58536583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.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="50" column="54" selection-start="1999" selection-end="1999" vertical-scroll-proportion="0.3341615"> + <state line="162" column="30" selection-start="8797" selection-end="8813" vertical-scroll-proportion="0.12969697"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.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="45" column="22" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33292684"> - <folding /> + <state line="80" column="16" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.41463414"> + <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/WebServiceContextJSE.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="43" column="4" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.34146342"> + <state line="34" column="30" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.34658384"> <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/WebServiceContextEJB.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="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> + <state line="29" column="27" selection-start="1189" selection-end="1189" vertical-scroll-proportion="0.2195122"> <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/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <state line="37" column="25" selection-start="1717" selection-end="1717" vertical-scroll-proportion="-1.8322982"> <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/InvocationModelFactoryImpl.java"> + <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="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <state line="49" column="17" selection-start="1782" selection-end="1793" vertical-scroll-proportion="-0.46829268"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <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> + <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"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 15:40:26 UTC (rev 3954) @@ -158,9 +158,9 @@ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.WebAppDesciptorModifierImpl"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.DefaultWebAppDesciptorModifierImpl"/> <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriter"> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -23,11 +23,8 @@ //$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; /** * A deployer that modifies the web.xml meta data Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -33,11 +33,8 @@ import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanProxyCreationException; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.*; /** * Publish the HTTP service endpoint to Tomcat Modified: branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 15:40:26 UTC (rev 3954) @@ -157,9 +157,9 @@ <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.BasicEndpointMetrics"/> <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.WebAppDesciptorModifierImpl"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.DefaultWebAppDesciptorModifierImpl"/> <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriter"> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -29,7 +29,7 @@ import org.jboss.metadata.web.ParamValue; import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; Modified: branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 15:40:26 UTC (rev 3954) @@ -195,8 +195,8 @@ <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.BasicEndpointMetrics"/> <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.WebAppDesciptorModifierImpl"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriter"> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> 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 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -24,13 +24,20 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.SPIProvider; 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; /** * @author Heiko.Braun(a)jboss.com @@ -59,10 +66,23 @@ T returnType = null; + // SPI provided by framework + if(spiType.equals(DeploymentModelFactory.class)) { returnType = (T)new DeploymentModelFactoryImpl(); } + else if (spiType.equals(ResourceInjector.class)) + { + returnType = (T) new WebServiceContextInjector(); + } + else if(spiType.equals(WebXMLRewriter.class)) + { + returnType = getKernelProvidedSPI("WSWebXMLRewriter", spiType); + } + + // SPI provided by either container or stack integration + else if(spiType.equals(InvocationModelFactory.class)) { // container integration needs to provide these @@ -74,11 +94,8 @@ returnType = (T) factory; } - else if (spiType.equals(ResourceInjector.class)) - { - returnType = (T) new WebServiceContextInjector(); - } + // help debugging if(null == returnType) log.debug("Failed to provide SPI '"+spiType+"'"); else @@ -86,5 +103,15 @@ 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/deployment/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -0,0 +1,166 @@ +/* + * 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 java.util.Iterator; +import java.util.Map; + +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.RewriteResults; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; + +/** + * Modifies web.xml for jbossws + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2006 + */ +public class DefaultWebAppDesciptorModifierImpl implements WebAppDesciptorModifier +{ + // logging support + private static Logger log = Logger.getLogger(DefaultWebAppDesciptorModifierImpl.class); + + public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException + { + RewriteResults results = new RewriteResults(); + Element root = webXml.getRootElement(); + + String propKey = SERVLET_CLASS; + String servletClass = (String)dep.getContext().getProperty(propKey); + if (servletClass == null) + throw new IllegalStateException("Cannot obtain context property: " + propKey); + + propKey = CONTEXT_PARAMETER_MAP; + Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + if (contextParams != null) + { + for (Map.Entry<String, String> entry : contextParams.entrySet()) + { + Element contextParam = root.addElement("context-param"); + contextParam.addElement("param-name").addText(entry.getKey()); + contextParam.addElement("param-value").addText(entry.getValue()); + } + } + + propKey = SERVLET_CONTEXT_LISTENER; + String listenerClass = (String)dep.getContext().getProperty(propKey); + if (listenerClass != null) + { + Element listener = root.addElement("listener"); + listener.addElement("listener-class").setText(listenerClass); + } + + for (Iterator it = root.elementIterator("servlet"); it.hasNext();) + { + Element servlet = (Element)it.next(); + String linkName = servlet.element("servlet-name").getTextTrim(); + + // find the servlet-class + Element classElement = servlet.element("servlet-class"); + + // JSP + if (classElement == null) + continue; + + String orgServletClassName = classElement.getTextTrim(); + + // Get the servlet class + Class orgServletClass = null; + try + { + ClassLoader loader = dep.getInitialClassLoader(); + orgServletClass = loader.loadClass(orgServletClassName); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + orgServletClassName); + } + + String targetBeanName = null; + + // Nothing to do if we have an <init-param> + if (isAlreadyModified(servlet)) + { + for (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();) + { + Element elParam = (Element)itParam.next(); + String paramName = elParam.element("param-name").getTextTrim(); + String paramValue = elParam.element("param-value").getTextTrim(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) + { + targetBeanName = paramValue; + } + } + } + else + { + // Check if it is a real servlet that we can ignore + if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass)) + { + log.info("Ignore servlet: " + orgServletClassName); + continue; + } + else if (orgServletClassName.endsWith("Servlet")) + { + log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); + continue; + } + + classElement.setText(servletClass); + + // add additional init params + if (orgServletClassName.equals(servletClass) == false) + { + targetBeanName = orgServletClassName; + Element paramElement = servlet.addElement("init-param"); + paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT); + paramElement.addElement("param-value").addText(targetBeanName); + } + } + + if (targetBeanName == null) + throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); + + // remember the target bean name + results.sepTargetMap.put(linkName, targetBeanName); + } + + return results; + } + + // Return true if the web.xml is already modified + private boolean isAlreadyModified(Element servlet) + { + for (Iterator it = servlet.elementIterator("init-param"); it.hasNext();) + { + Element elParam = (Element)it.next(); + String paramName = elParam.element("param-name").getTextTrim(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) + return true; + } + return false; + } +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework.deployment; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.dom4j.Document; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * Modifies the web app according to the stack requirements. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public interface WebAppDesciptorModifier -{ - final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; - final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; - final String SERVLET_CLASS = "ServletClass"; - - // The results of the URL rewriting - class RewriteResults - { - // The URL to the rewrittn web.xml - public URL webXML; - // Maps the servlet name to the target bean - public Map<String, String> sepTargetMap = new HashMap<String, String>(); - } - - RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; -} \ No newline at end of file Deleted: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -1,164 +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.deployment; - -import java.util.Iterator; -import java.util.Map; - -import org.dom4j.Document; -import org.dom4j.Element; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * Modifies web.xml for jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2006 - */ -public class WebAppDesciptorModifierImpl implements WebAppDesciptorModifier -{ - // logging support - private static Logger log = Logger.getLogger(WebAppDesciptorModifierImpl.class); - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - Element root = webXml.getRootElement(); - - String propKey = SERVLET_CLASS; - String servletClass = (String)dep.getContext().getProperty(propKey); - if (servletClass == null) - throw new IllegalStateException("Cannot obtain context property: " + propKey); - - propKey = CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); - if (contextParams != null) - { - for (Map.Entry<String, String> entry : contextParams.entrySet()) - { - Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(entry.getKey()); - contextParam.addElement("param-value").addText(entry.getValue()); - } - } - - propKey = SERVLET_CONTEXT_LISTENER; - String listenerClass = (String)dep.getContext().getProperty(propKey); - if (listenerClass != null) - { - Element listener = root.addElement("listener"); - listener.addElement("listener-class").setText(listenerClass); - } - - for (Iterator it = root.elementIterator("servlet"); it.hasNext();) - { - Element servlet = (Element)it.next(); - String linkName = servlet.element("servlet-name").getTextTrim(); - - // find the servlet-class - Element classElement = servlet.element("servlet-class"); - - // JSP - if (classElement == null) - continue; - - String orgServletClassName = classElement.getTextTrim(); - - // Get the servlet class - Class orgServletClass = null; - try - { - ClassLoader loader = dep.getInitialClassLoader(); - orgServletClass = loader.loadClass(orgServletClassName); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + orgServletClassName); - } - - String targetBeanName = null; - - // Nothing to do if we have an <init-param> - if (isAlreadyModified(servlet)) - { - for (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();) - { - Element elParam = (Element)itParam.next(); - String paramName = elParam.element("param-name").getTextTrim(); - String paramValue = elParam.element("param-value").getTextTrim(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) - { - targetBeanName = paramValue; - } - } - } - else - { - // Check if it is a real servlet that we can ignore - if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass)) - { - log.info("Ignore servlet: " + orgServletClassName); - continue; - } - else if (orgServletClassName.endsWith("Servlet")) - { - log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); - continue; - } - - classElement.setText(servletClass); - - // add additional init params - if (orgServletClassName.equals(servletClass) == false) - { - targetBeanName = orgServletClassName; - Element paramElement = servlet.addElement("init-param"); - paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT); - paramElement.addElement("param-value").addText(targetBeanName); - } - } - - if (targetBeanName == null) - throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); - - // remember the target bean name - results.sepTargetMap.put(linkName, targetBeanName); - } - - return results; - } - - // Return true if the web.xml is already modified - private boolean isAlreadyModified(Element servlet) - { - for (Iterator it = servlet.elementIterator("init-param"); it.hasNext();) - { - Element elParam = (Element)it.next(); - String paramName = elParam.element("param-name").getTextTrim(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) - return true; - } - return false; - } -} \ No newline at end of file Deleted: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -1,121 +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.deployment; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.net.URL; - -import javax.xml.ws.WebServiceException; - -import org.dom4j.Document; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.SAXReader; -import org.dom4j.io.XMLWriter; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier.RewriteResults; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.common.IOUtils; - -/** - * The rewriter for web.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public class WebXMLRewriter -{ - private WebAppDesciptorModifier desciptorModifier; - - public WebAppDesciptorModifier getDesciptorModifier() - { - return desciptorModifier; - } - - public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier) - { - this.desciptorModifier = desciptorModifier; - } - - public RewriteResults rewriteWebXml(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployment info"); - - URL warURL = udi.webappURL; - File warFile = new File(warURL.getFile()); - if (warFile.isDirectory() == false) - throw new WebServiceException("Expected a war directory: " + warURL); - - File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); - if (webXML.isFile() == false) - throw new WebServiceException("Cannot find web.xml: " + webXML); - - try - { - // After redeployment there might be a stale copy of the original web.xml.org, we delete it - File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); - orgWebXML.delete(); - - // Rename the web.xml - if (webXML.renameTo(orgWebXML) == false) - throw new WebServiceException("Cannot rename web.xml: " + orgWebXML); - - FileInputStream stream = new FileInputStream(orgWebXML); - return rewriteWebXml(stream, webXML, dep); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new WebServiceException(e); - } - } - - private RewriteResults rewriteWebXml(InputStream source, File destFile, Deployment dep) throws Exception - { - if (destFile == null) - { - destFile = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); - destFile.deleteOnExit(); - } - - SAXReader reader = new SAXReader(); - Document document = reader.read(source); - - RewriteResults results = desciptorModifier.modifyDescriptor(dep, document); - results.webXML = destFile.toURL(); - - FileOutputStream fos = new FileOutputStream(destFile); - OutputFormat format = OutputFormat.createPrettyPrint(); - XMLWriter writer = new XMLWriter(fos, format); - writer.write(document); - writer.close(); - - return results; - } -} \ No newline at end of file Added: 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 (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -0,0 +1,119 @@ +/* + * 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 java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.URL; + +import javax.xml.ws.WebServiceException; + +import org.dom4j.Document; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; +import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.common.IOUtils; + +/** + * The rewriter for web.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class WebXMLRewriterImpl implements WebXMLRewriter +{ + private WebAppDesciptorModifier desciptorModifier; + + public WebAppDesciptorModifier getDesciptorModifier() + { + return desciptorModifier; + } + + public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier) + { + this.desciptorModifier = desciptorModifier; + } + + public RewriteResults rewriteWebXml(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployment info"); + + URL warURL = udi.webappURL; + File warFile = new File(warURL.getFile()); + if (warFile.isDirectory() == false) + throw new WebServiceException("Expected a war directory: " + warURL); + + File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); + if (webXML.isFile() == false) + throw new WebServiceException("Cannot find web.xml: " + webXML); + + try + { + // After redeployment there might be a stale copy of the original web.xml.org, we delete it + File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); + orgWebXML.delete(); + + // Rename the web.xml + if (webXML.renameTo(orgWebXML) == false) + throw new WebServiceException("Cannot rename web.xml: " + orgWebXML); + + FileInputStream stream = new FileInputStream(orgWebXML); + return rewriteWebXml(stream, webXML, dep); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } + + private RewriteResults rewriteWebXml(InputStream source, File destFile, Deployment dep) throws Exception + { + if (destFile == null) + { + destFile = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); + destFile.deleteOnExit(); + } + + SAXReader reader = new SAXReader(); + Document document = reader.read(source); + + RewriteResults results = desciptorModifier.modifyDescriptor(dep, document); + results.webXML = destFile.toURL(); + + FileOutputStream fos = new FileOutputStream(destFile); + OutputFormat format = OutputFormat.createPrettyPrint(); + XMLWriter writer = new XMLWriter(fos, format); + writer.write(document); + writer.close(); + + return results; + } +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -0,0 +1,38 @@ +/* + * 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 java.net.URL; +import java.util.Map; +import java.util.HashMap; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class RewriteResults +{ + // The URL to the rewritten web.xml + public URL webXML; + // Maps the servlet name to the target bean + public Map<String, String> sepTargetMap = new HashMap<String, String>(); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -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.deployment; + +import org.dom4j.Document; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.RewriteResults; +import org.jboss.wsf.spi.SPIView; + +/** + * Modifies the web app according to the stack requirements. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public interface WebAppDesciptorModifier extends SPIView +{ + final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; + final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; + final String SERVLET_CLASS = "ServletClass"; + + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -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.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 +{ + RewriteResults rewriteWebXml(Deployment dep); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -27,11 +27,11 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; /** - * Modifies web.xml for jbossws + * Modifies web.xml for sun-ri * * @author Thomas.Diesler(a)jboss.org * @since 19-May-2006 Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -27,11 +27,11 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; /** - * Modifies web.xml for jbossws + * Modifies web.xml for xfire * * @author Thomas.Diesler(a)jboss.org * @since 21-May-2006 Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-19 15:40:26 UTC (rev 3954) @@ -30,7 +30,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.xfire.metadata.services.DDBean; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans;