Author: heiko.braun(a)jboss.com Date: 2007-07-27 09:54:43 -0400 (Fri, 27 Jul 2007) New Revision: 4022 Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/int-42.iml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/int-50.iml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/native/src/main/resources/jbossws-native-config.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml Log: Eleminate WebXMLRewriter dependency. It's kept redundant in container intergation packages now Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/JBossWS-Trunk.iws 2007-07-27 13:54:43 UTC (rev 4022) @@ -20,20 +20,41 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/int-native.iml" afterPath="$PROJECT_DIR$/integration/native/int-native.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" afterPath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/build.iml" afterPath="$PROJECT_DIR$/build/build.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/eclipse/jbossws.userlibraries" afterPath="$PROJECT_DIR$/build/eclipse/jbossws.userlibraries" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" afterPath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" afterPath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" afterPath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/spi.iml" afterPath="$PROJECT_DIR$/integration/spi/spi.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" afterPath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -157,7 +178,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="50" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="48" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -293,39 +314,7 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="true" current-in-tab="true"> - <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="127" column="33" selection-start="4801" selection-end="4801" vertical-scroll-proportion="0.33614457"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="StatelessBeanContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="15" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.56213015"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="EJBContainerInvocation.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="0" selection-start="1057" selection-end="1057" vertical-scroll-proportion="-0.6192771"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -356,7 +345,188 @@ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> - <component name="PackagesPane" /> + <component name="PackagesPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="deployment" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="stack" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> <option name="CLIENT" value="" /> @@ -427,8 +597,8 @@ <component name="PropertiesComponent"> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> - <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="GoToClass.includeLibraries" value="false" /> @@ -439,6 +609,8 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.container.jboss50" /> + <recent name="org.jboss.wsf.container.jboss42" /> <recent name="org.jboss.wsf.stack.jbws" /> <recent name="org.jboss.wsf.stack.sunri" /> <recent name="org.jboss.wsf.stack.xfire" /> @@ -451,107 +623,18 @@ <recent name="org.jboss.wsf.stack.jbws" /> </key> </component> - <component name="RestoreUpdateTree"> - <UpdateInfo date="7/26/07 4:18 PM" ActionInfo="_Update"> - <UpdatedFiles> - <FILE-GROUP> - <option name="myUpdateName" value="Updated from server" /> - <option name="myStatusName" value="Changed on server" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="CHANGED_ON_SERVER" /> - <FILE-GROUP> - <option name="myUpdateName" value="Updated" /> - <option name="myStatusName" value="Changed" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="UPDATED" /> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java</PATH> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Created" /> - <option name="myStatusName" value="Created" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="CREATED" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Deleted" /> - <option name="myStatusName" value="Deleted" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="true" /> - <option name="myId" value="REMOVED_FROM_REPOSITORY" /> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java</PATH> - <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java</PATH> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Restored" /> - <option name="myStatusName" value="Will be restored" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="RESTORED" /> - </FILE-GROUP> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Modified" /> - <option name="myStatusName" value="Modified" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="MODIFIED" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Skipped" /> - <option name="myStatusName" value="Skipped" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="SKIPPED" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Merged with conflicts" /> - <option name="myStatusName" value="Will be merged with conflicts" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="MERGED_WITH_CONFLICTS" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Merged" /> - <option name="myStatusName" value="Will be merged" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="MERGED" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Not in repository" /> - <option name="myStatusName" value="Not in repository" /> - <option name="mySupportsDeletion" value="true" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="UNKNOWN" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Locally added" /> - <option name="myStatusName" value="Locally added" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="LOCALLY_ADDED" /> - </FILE-GROUP> - <FILE-GROUP> - <option name="myUpdateName" value="Locally removed" /> - <option name="myStatusName" value="Locally removed" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="LOCALLY_REMOVED" /> - </FILE-GROUP> - </UpdatedFiles> - </UpdateInfo> - </component> + <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.client"> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -564,16 +647,6 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -589,6 +662,9 @@ <option name="TEST_SEARCH_SCOPE"> <value defaultName="wholeProject" /> </option> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -691,32 +767,34 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="6" /> - <editor active="true" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <editor active="false" /> <layout> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50342464" order="1" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295325" order="8" /> + <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <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="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27469134" order="0" /> + <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.2080247" order="2" /> + <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5080275" order="1" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39862543" order="4" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295325" order="8" /> - <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25585696" order="1" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66323024" order="8" /> - <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3220859" order="0" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13440198" order="2" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6536697" order="8" /> + <window_info id="soapUI Navigator" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> - <window_info id="TunnelliJ 1.3" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="TunnelliJ 1.3" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -796,125 +874,131 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="Local Scopes" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="as-ejb3" /> + <option name="myLastEditedConfigurable" value="int-42" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="428" column="27" selection-start="12534" selection-end="12534" vertical-scroll-proportion="0.07619048"> + <state line="31" column="22" selection-start="1291" selection-end="1291" vertical-scroll-proportion="0.25866336"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="175" column="17" selection-start="5373" selection-end="5373" vertical-scroll-proportion="0.024242423"> + <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.20777643"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0" /> + <state line="31" column="47" selection-start="1276" selection-end="1276" vertical-scroll-proportion="0.25394896"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="76" column="70" selection-start="4241" selection-end="4241" vertical-scroll-proportion="0.6060606"> + <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.25394896"> <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/spi/deployment/LifecycleHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="81" column="10" selection-start="2762" selection-end="2984" vertical-scroll-proportion="0.2857143"> + <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23086269"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="17" selection-start="1315" selection-end="1315" vertical-scroll-proportion="0.2923077"> + <state line="49" column="56" selection-start="1870" selection-end="1902" vertical-scroll-proportion="0.31510106"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native50/jbossws-beans.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="55" column="52" selection-start="3022" selection-end="3022" vertical-scroll-proportion="0.15133172"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="20" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.38224852"> + <state line="53" column="40" selection-start="2940" selection-end="2960" vertical-scroll-proportion="-0.055690072"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="51" selection-start="1926" selection-end="1926" vertical-scroll-proportion="0.53964496"> + <state line="69" column="40" selection-start="3657" selection-end="3657" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="10" selection-start="2749" selection-end="2749" vertical-scroll-proportion="0.15621302"> + <state line="34" column="40" selection-start="1858" selection-end="1858" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="13" selection-start="1863" selection-end="1863" vertical-scroll-proportion="-0.6970414"> + <state line="109" column="52" selection-start="3569" selection-end="3569" vertical-scroll-proportion="0.59334123"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="0" selection-start="1057" selection-end="1057" vertical-scroll-proportion="-0.6192771"> + <state line="118" column="58" selection-start="4478" selection-end="4478" vertical-scroll-proportion="2.214031"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/BeanContext.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="29" selection-start="1086" selection-end="1086" vertical-scroll-proportion="0.06745562"> + <state line="47" column="23" selection-start="1854" selection-end="1854" vertical-scroll-proportion="-0.27602905"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-javaee.jar!/javax/ejb/EJBContext.class"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="17" selection-start="151" selection-end="151" vertical-scroll-proportion="0.08994083"> - <folding /> + <state line="23" column="47" selection-start="1103" selection-end="1103" vertical-scroll-proportion="0.06777646"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="15" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.56213015"> + <state line="25" column="0" selection-start="1141" selection-end="1263" vertical-scroll-proportion="0.11058264"> <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/InvocationHandlerEJB3.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="127" column="33" selection-start="4801" selection-end="4801" vertical-scroll-proportion="0.33614457"> - <folding /> - </state> - </provider> - </entry> </component> <component name="simpleUML.DiagramSettingsWorkspace" /> <component name="simpleUML.UMLToolWindowPlugin"> Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -152,9 +152,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.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> + <bean name="WSWebXMLRewriter" class="org.jboss.org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> Modified: trunk/integration/jboss42/int-42.iml =================================================================== --- trunk/integration/jboss42/int-42.iml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss42/int-42.iml 2007-07-27 13:54:43 UTC (rev 4022) @@ -9,31 +9,40 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="spi" /> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> + <orderEntry type="module" module-name="42-ejb3" /> + <orderEntry type="module" module-name="42-server" /> + <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="module" module-name="jbossws-core" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/dom4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="42-server" /> + <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="library" name="jboss-logging-spi" level="application" /> + <orderEntry type="library" name="servlet-api" level="application" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/ejb3.deployer/jboss-ejb3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="jboss-system" level="project" /> - <orderEntry type="library" name="jboss-jmx" level="project" /> - <orderEntry type="library" name="jboss-system-jmx" level="project" /> - <orderEntry type="module" module-name="jbossws-core" /> - <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,20 +23,19 @@ // $Id$ -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - import org.jboss.deployment.DeploymentInfo; import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + /** * Build container independent deployment info. * @@ -78,7 +77,7 @@ if (webMetaData != null) dep.addAttachment(JSEArchiveMetaData.class, webMetaData); - dep.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); + dep.setProperty("org.jboss.ws.webapp.url", getDeploymentURL(di)); } else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) { Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -0,0 +1,164 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.logging.Logger; +import org.dom4j.Document; +import org.dom4j.Element; + +import java.util.Iterator; +import java.util.Map; + +/** + * 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 = "org.jboss.ws.webapp.ServletClass"; + String servletClass = (String)dep.getProperty(propKey); + if (servletClass == null) + throw new IllegalStateException("Cannot obtain context property: " + propKey); + + propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.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 = "org.jboss.ws.webapp.ServletContextListener"; + String listenerClass = (String)dep.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; + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,9 +23,9 @@ //$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; -import org.jboss.wsf.framework.deployment.RewriteResults; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that modifies the web.xml meta data @@ -35,9 +35,9 @@ */ public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect { - private WebXMLRewriter webXMLRewriter; + private WebXMLRewriterImpl webXMLRewriter; - public void setWebXMLRewriter(WebXMLRewriter serviceEndpointPublisher) + public void setWebXMLRewriter(WebXMLRewriterImpl serviceEndpointPublisher) { this.webXMLRewriter = serviceEndpointPublisher; } Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -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.container.jboss42; + +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: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,19 +23,19 @@ // $Id: WebAppDeployerDeployer.java 3183 2007-05-22 13:06:13Z thomas.diesler(a)jboss.com $ -import java.net.URL; - -import javax.management.MBeanServer; - import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.MainDeployerMBean; import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanProxyCreationException; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; -import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import javax.management.MBeanServer; +import java.net.URL; + /** * Publish the HTTP service endpoint to Tomcat * @@ -47,9 +47,9 @@ // provide logging private static Logger log = Logger.getLogger(WebAppDeploymentAspect.class); - private WebXMLRewriter webXMLRewriter; + private WebXMLRewriterImpl webXMLRewriter; - public void setWebXMLRewriter(WebXMLRewriter serviceEndpointPublisher) + public void setWebXMLRewriter(WebXMLRewriterImpl serviceEndpointPublisher) { this.webXMLRewriter = serviceEndpointPublisher; } @@ -58,7 +58,7 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); log.debug("publishServiceEndpoint: " + warURL); try @@ -83,7 +83,7 @@ public void destroy(Deployment dep) { - URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); if (warURL == null) { log.error("Cannot obtain warURL"); Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.dom4j.Document; + +/** + * 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 = "org.jboss.ws.webapp.ServletContextListener"; + final String CONTEXT_PARAMETER_MAP = "org.jboss.ws.webapp.ContextParameterMap"; + final String SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass"; + + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.common.IOUtils; + +import javax.xml.ws.WebServiceException; +import java.net.URL; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.FileOutputStream; + +import org.dom4j.io.SAXReader; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; +import org.dom4j.Document; + +/** + * The rewriter for web.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class WebXMLRewriterImpl +{ + private WebAppDesciptorModifier desciptorModifier; + + public WebXMLRewriterImpl() + { + this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl(); + } + + public WebAppDesciptorModifier getDesciptorModifier() + { + return desciptorModifier; + } + + public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier) + { + this.desciptorModifier = desciptorModifier; + } + + public RewriteResults rewriteWebXml(Deployment dep) + { + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + 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; + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -150,9 +150,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.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> Modified: trunk/integration/jboss50/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss50/int-50.iml 2007-07-27 13:54:43 UTC (rev 4022) @@ -27,6 +27,60 @@ </orderEntry> <orderEntry type="library" name="jboss-aop-jdk50" level="application" /> <orderEntry type="library" name="jboss-jaxrpc" level="application" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-vfs.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-deployers.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/dom4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,19 +23,18 @@ //$Id$ -import java.net.URL; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import java.net.URL; + /** * Build container independent deployment info. * @@ -82,7 +81,7 @@ if (dep instanceof ArchiveDeployment) { URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); - dep.setProperty(WebXMLRewriter.WEBAPP_URL, webURL); + dep.setProperty("org.jboss.ws.webapp.url", webURL); } } Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -0,0 +1,164 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.logging.Logger; +import org.dom4j.Document; +import org.dom4j.Element; + +import java.util.Map; +import java.util.Iterator; + +/** + * 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 = "org.jboss.ws.webapp.ServletClass"; + String servletClass = (String)dep.getProperty(propKey); + if (servletClass == null) + throw new IllegalStateException("Cannot obtain context property: " + propKey); + + propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.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 = "org.jboss.ws.webapp.ServletContextListener"; + String listenerClass = (String)dep.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; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -29,7 +29,6 @@ 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.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; @@ -48,19 +47,19 @@ @Override public void create(Deployment dep) { - String propKey = WebAppDesciptorModifier.SERVLET_CLASS; + String propKey = "org.jboss.ws.webapp.ServletClass"; String servletClass = (String)dep.getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); modifyServletClass(dep, servletClass); - propKey = WebAppDesciptorModifier.SERVLET_CONTEXT_LISTENER; + propKey = "org.jboss.ws.webapp.ServletContextListener"; String listenerClass = (String)dep.getProperty(propKey); if (listenerClass != null) modifyListener(dep, listenerClass); - propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; + propKey = "org.jboss.ws.webapp.ContextParameterMap"; Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams != null) modifyContextParams(dep, contextParams); Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -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.container.jboss50; + +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: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,20 +23,19 @@ // $Id: WebAppDeployerDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - import org.jboss.deployers.client.spi.DeployerClient; import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; 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.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import java.net.URL; +import java.util.Map; +import java.util.HashMap; + /** * Publish the HTTP service endpoint to Tomcat * @@ -49,7 +48,7 @@ private static Logger log = Logger.getLogger(WebAppDeploymentAspect.class); private DeployerClient mainDeployer; - private WebXMLRewriter webXMLRewriter; + private WebXMLRewriterImpl webXMLRewriter; private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>(); public void setMainDeployer(DeployerClient mainDeployer) @@ -57,7 +56,7 @@ this.mainDeployer = mainDeployer; } - public void setWebXMLRewriter(WebXMLRewriter serviceEndpointPublisher) + public void setWebXMLRewriter(WebXMLRewriterImpl serviceEndpointPublisher) { this.webXMLRewriter = serviceEndpointPublisher; } @@ -66,7 +65,7 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); log.debug("publishServiceEndpoint: " + warURL); try @@ -87,7 +86,7 @@ public void destroy(Deployment dep) { - URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); if (warURL == null) { log.error("Cannot obtain warURL"); Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.dom4j.Document; + +/** + * 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 = "org.jboss.ws.webapp.ServletContextListener"; + final String CONTEXT_PARAMETER_MAP = "org.jboss.ws.webapp.ContextParameterMap"; + final String SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass"; + + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -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.container.jboss50; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.common.IOUtils; +import org.dom4j.io.SAXReader; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; +import org.dom4j.Document; + +import javax.xml.ws.WebServiceException; +import java.net.URL; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.FileOutputStream; + +/** + * The rewriter for web.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class WebXMLRewriterImpl +{ + private WebAppDesciptorModifier desciptorModifier; + + public WebXMLRewriterImpl() + { + this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl(); + } + + public WebAppDesciptorModifier getDesciptorModifier() + { + return desciptorModifier; + } + + public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier) + { + this.desciptorModifier = desciptorModifier; + } + + public RewriteResults rewriteWebXml(Deployment dep) + { + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + 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; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -196,8 +196,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.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss50.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -51,7 +51,7 @@ <property name="provides">ContextProperties</property> <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> </map> </property> </bean> Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -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 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.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.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.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: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,38 +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.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>(); -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,41 +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 org.dom4j.Document; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.framework.deployment.RewriteResults; - -/** - * 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"; - - RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; -} \ No newline at end of file Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -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.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.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.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 Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -76,12 +76,12 @@ if (dep.getType().toString().endsWith("EJB21")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); - dep.setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } else if (dep.getType().toString().endsWith("EJB3")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); - dep.setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } } Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,35 +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 org.jboss.wsf.spi.deployment.Deployment; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public interface WebXMLRewriter -{ - final String WEBAPP_URL = "org.jboss.ws.webapp.url"; - - RewriteResults rewriteWebXml(Deployment dep); -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,120 +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.common.IOUtils; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * The rewriter for web.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public class WebXMLRewriterImpl implements WebXMLRewriter -{ - private WebAppDesciptorModifier desciptorModifier; - - public WebXMLRewriterImpl() - { - this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl(); - } - - public WebAppDesciptorModifier getDesciptorModifier() - { - return desciptorModifier; - } - - public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier) - { - this.desciptorModifier = desciptorModifier; - } - - public RewriteResults rewriteWebXml(Deployment dep) - { - URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); - 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 Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,19 +23,17 @@ //$Id: SunJaxwsDeployer.java 3802 2007-07-05 16:44:32Z thomas.diesler(a)jboss.com $ -import java.util.HashMap; -import java.util.Map; - -import javax.xml.ws.BindingType; -import javax.xml.ws.soap.SOAPBinding; - 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.stack.sunri.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; +import javax.xml.ws.BindingType; +import javax.xml.ws.soap.SOAPBinding; +import java.util.HashMap; +import java.util.Map; + /** * A deployer that generates sun-jaxws.xml * @@ -76,7 +74,7 @@ dep.addAttachment(DDEndpoints.class, dd); - String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams == null) { Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,136 +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.stack.sunri; - -import java.util.Iterator; - -import org.dom4j.Document; -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.stack.sunri.metadata.sunjaxws.DDEndpoints; -import org.jboss.wsf.framework.deployment.RewriteResults; - -/** - * Modifies web.xml for sun-ri - * - * @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); - - private String listenerClass; - private String servletClass; - - public String getListenerClass() - { - return listenerClass; - } - - public void setListenerClass(String listenerClass) - { - this.listenerClass = listenerClass; - } - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - - Element root = webXml.getRootElement(); - - DDEndpoints ddSunJaxws = dep.getAttachment(DDEndpoints.class); - if (ddSunJaxws == null) - throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - - Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); - contextParam.addElement("param-value").addText(ddSunJaxws.createFileURL().toExternalForm()); - - root.addElement("listener").addElement("listener-class").addText(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; - - // 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); - targetBeanName = orgServletClassName; - - 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; - } -} \ No newline at end of file Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -67,8 +67,8 @@ <property name="provides">ContextProperties</property> <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry> - <entry><key>ServletContextListener</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry> + <entry><key>org.jboss.ws.webapp.ServletContextListener</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry> </map> </property> </bean> Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -23,19 +23,18 @@ //$Id: XFireServicesDeployer.java 3802 2007-07-05 16:44:32Z thomas.diesler(a)jboss.com $ -import java.util.HashMap; -import java.util.Map; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; 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.Deployment.DeploymentType; import org.jboss.wsf.stack.xfire.metadata.services.DDBean; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; import org.jboss.wsf.stack.xfire.metadata.services.DDEndpoint; +import java.util.HashMap; +import java.util.Map; + /** * A deployer that generates cxf.xml * @@ -106,7 +105,7 @@ dep.addAttachment(DDBeans.class, dd); - String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams == null) { Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-27 13:54:43 UTC (rev 4022) @@ -1,123 +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.stack.xfire; - -import java.util.Iterator; - -import org.dom4j.Document; -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.stack.xfire.metadata.services.DDBeans; -import org.jboss.wsf.framework.deployment.RewriteResults; - -/** - * Modifies web.xml for xfire - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2006 - */ -public class WebAppDesciptorModifierImpl implements WebAppDesciptorModifier -{ - // logging support - private static Logger log = Logger.getLogger(WebAppDesciptorModifierImpl.class); - - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - - Element root = webXml.getRootElement(); - - DDBeans ddbeans = dep.getAttachment(DDBeans.class); - if (ddbeans == null) - throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - - Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(CXFServletExt.PARAM_CXF_BEANS_URL); - contextParam.addElement("param-value").addText(ddbeans.createFileURL().toExternalForm()); - - 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; - - // 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); - targetBeanName = orgServletClassName; - - 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; - } -} \ No newline at end of file Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-27 09:55:27 UTC (rev 4021) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-27 13:54:43 UTC (rev 4022) @@ -32,7 +32,7 @@ <property name="provides">ContextProperties</property> <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>ServletClass</key><value>org.jboss.wsf.stack.xfire.CXFServletExt</value></entry> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.xfire.CXFServletExt</value></entry> </map> </property> </bean>