July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3963 - in trunk/integration/xfire: src/main/java/org/jboss/wsf/stack/xfire and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-20 12:11:24 -0400 (Fri, 20 Jul 2007) New Revision: 3963 Modified: trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java Log: More on cxf integration Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-20 15:34:56 UTC (rev 3962) +++ trunk/integration/xfire/build.xml 2007-07-20 16:11:24 UTC (rev 3963) @@ -154,14 +154,23 @@ </fileset> <fileset dir="${thirdparty.dir}"> <include name="cxf-incubator.jar"/> + <include name="geronimo-ws-metadata.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> + <include name="neethi.jar"/> <include name="wsdl4j.jar"/> + <include name="resolver.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="spring-bean.jar"/> + <include name="spring-beans.jar"/> + <include name="spring-context.jar"/> <include name="spring-core.jar"/> + <include name="stax-api.jar"/> + <include name="wstx.jar"/> <include name="xbean.jar"/> + <include name="XmlSchema.jar"/> </fileset> <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire.jar"/> 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-20 15:34:56 UTC (rev 3962) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-20 16:11:24 UTC (rev 3963) @@ -78,13 +78,13 @@ if (depType == DeploymentType.JAXWS_EJB3) { - ddep.setServiceFactory(ServiceFactoryBeanEJB3.class.getName()); + //ddep.setServiceFactory(ServiceFactoryBeanEJB3.class.getName()); ddep.setInvoker(invokerEJB3); } if (depType == DeploymentType.JAXWS_JSE) { - ddep.setServiceFactory(ServiceFactoryBeanJSE.class.getName()); + //ddep.setServiceFactory(ServiceFactoryBeanJSE.class.getName()); ddep.setInvoker(invokerJSE); }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3962 - in trunk: integration/jboss40/src/main/resources and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-20 11:34:56 -0400 (Fri, 20 Jul 2007) New Revision: 3962 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java Removed: trunk/hbraun-trunk.ipr trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: Move EndpointAddressDeploymentAspect to 'spi.framework' package Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/JBossWS-Trunk.iws 2007-07-20 15:34:56 UTC (rev 3962) @@ -228,66 +228,24 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <file leaf-file-name="jbossws-deployer-beans.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="24" selection-start="1291" selection-end="2750" vertical-scroll-proportion="0.9006211"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="org.jboss.ws.core.server.HttpServer" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <file leaf-file-name="DeploymentAspectInstaller.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="org.jboss.wsf.spi.invocation.InvocationModelFactory" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2132" selection-end="2132" vertical-scroll-proportion="0.3416149"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -574,7 +532,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -584,11 +542,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -598,25 +556,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -624,35 +590,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -662,43 +628,39 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -708,25 +670,37 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -734,33 +708,41 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.sar" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.sar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -768,37 +750,51 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -806,27 +802,43 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -836,21 +848,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> </component> <component name="ProjectReloadState"> @@ -885,8 +905,8 @@ </component> <component name="RecentsManager"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.framework" /> - <recent name="org.jboss.wsf.framework.deployment" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -1013,7 +1033,7 @@ <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33353883" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.31935883" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.465063" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> @@ -1099,20 +1119,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="10" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.35714287"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1463" selection-end="1463" vertical-scroll-proportion="0.30952382"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> <provider selected="true" editor-type-id="text-editor"> <state line="65" column="60" selection-start="2361" selection-end="2361" vertical-scroll-proportion="0.33333334"> @@ -1154,9 +1160,9 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> <folding /> </state> </provider> @@ -1170,6 +1176,27 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> @@ -1179,36 +1206,36 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2132" selection-end="2132" vertical-scroll-proportion="0.3416149"> + <state line="55" column="3" selection-start="2129" selection-end="2129" vertical-scroll-proportion="0.3416149"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="67" column="26" selection-start="2596" selection-end="2596" vertical-scroll-proportion="0.6787879"> <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/framework/deployment/DeploymentAspectInstaller.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <folding /> + </state> + </provider> + </entry> </component> </project> Deleted: trunk/hbraun-trunk.ipr =================================================================== --- trunk/hbraun-trunk.ipr 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/hbraun-trunk.ipr 2007-07-20 15:34:56 UTC (rev 3962) @@ -1,224 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4" relativePaths="false"> - <component name="AntConfiguration"> - <defaultAnt bundledAnt="true" /> - </component> - <component name="CodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS" /> - <option name="USE_PER_PROJECT_SETTINGS" value="false" /> - </component> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> - <option name="DEPLOY_AFTER_MAKE" value="0" /> - <resourceExtensions> - <entry name=".+\.(properties|xml|html|dtd|tld)" /> - <entry name=".+\.(gif|png|jpeg|jpg)" /> - </resourceExtensions> - <wildcardResourcePatterns> - <entry name="?*.properties" /> - <entry name="?*.xml" /> - <entry name="?*.gif" /> - <entry name="?*.png" /> - <entry name="?*.jpeg" /> - <entry name="?*.jpg" /> - <entry name="?*.html" /> - <entry name="?*.dtd" /> - <entry name="?*.tld" /> - </wildcardResourcePatterns> - </component> - <component name="DataSourceManagerImpl" /> - <component name="DependenciesAnalyzeManager"> - <option name="myForwardDirection" value="false" /> - </component> - <component name="DependencyValidationManager" /> - <component name="EntryPointsManager"> - <entry_points /> - </component> - <component name="ExportToHTMLSettings"> - <option name="PRINT_LINE_NUMBERS" value="false" /> - <option name="OPEN_IN_BROWSER" value="false" /> - <option name="OUTPUT_DIRECTORY" /> - </component> - <component name="GUI Designer component loader factory" /> - <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="JavadocGenerationManager"> - <option name="OUTPUT_DIRECTORY" /> - <option name="OPTION_SCOPE" value="protected" /> - <option name="OPTION_HIERARCHY" value="true" /> - <option name="OPTION_NAVIGATOR" value="true" /> - <option name="OPTION_INDEX" value="true" /> - <option name="OPTION_SEPARATE_INDEX" value="true" /> - <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> - <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> - <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> - <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> - <option name="OPTION_DEPRECATED_LIST" value="true" /> - <option name="OTHER_OPTIONS" value="" /> - <option name="HEAP_SIZE" /> - <option name="OPEN_IN_BROWSER" value="true" /> - </component> - <component name="JikesSettings"> - <option name="JIKES_PATH" value="" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="DEPRECATION" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="IS_EMACS_ERRORS_MODE" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - </group> - </component> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/system/42-system.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/system/42-system.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss40/int-40.iml" filepath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss42/int-42.iml" filepath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss50/int-50.iml" filepath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/native/int-native.iml" filepath="$PROJECT_DIR$/integration/native/int-native.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/sunri/int-sunri.iml" filepath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/xfire/int-xfire.iml" filepath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> - <module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml" filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml" filepath="$PROJECT_DIR$/integration/spi/spi.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" filepath="/home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" /> - <module fileurl="file://$PROJECT_DIR$/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - </modules> - </component> - <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" /> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="libraryTable"> - <library name="jboss-logging-spi"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </component> - <component name="uidesigner-configuration"> - <option name="INSTRUMENT_CLASSES" value="true" /> - <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> - </component> - <UsedPathMacros /> -</project> - Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -90,7 +90,7 @@ </bean>  - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -89,7 +89,7 @@ <property name="provides">ContextRoot</property> </bean> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> 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-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -143,7 +143,7 @@ <property name="provides">ContextRoot</property> </bean> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:34:56 UTC (rev 3962) @@ -0,0 +1,57 @@ +/* + * 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.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; + +//$Id$ + +/** + * A deployer that assigns the endpoint address. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class EndpointAddressDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + String urlPattern = ep.getURLPattern(); + if (urlPattern == null) + throw new IllegalStateException("Cannot obtain url pattern"); + + if (urlPattern.endsWith("/*")) + urlPattern = urlPattern.substring(0, urlPattern.length() - 2); + + ep.setAddress(contextRoot + urlPattern); + } + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:34:56 UTC (rev 3962) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.deployment; - -//$Id: URLPatternDeployer.java 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ - -/** - * A deployer that assigns the endpoint address. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public class EndpointAddressDeploymentAspect extends DeploymentAspect -{ - @Override - public void create(Deployment dep) - { - String contextRoot = dep.getService().getContextRoot(); - if (contextRoot == null) - throw new IllegalStateException("Cannot obtain context root"); - - for (Endpoint ep : dep.getService().getEndpoints()) - { - String urlPattern = ep.getURLPattern(); - if (urlPattern == null) - throw new IllegalStateException("Cannot obtain url pattern"); - - if (urlPattern.endsWith("/*")) - urlPattern = urlPattern.substring(0, urlPattern.length() - 2); - - ep.setAddress(contextRoot + urlPattern); - } - } -} \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3961 - in trunk: integration/xfire/src/main/java/org/jboss/wsf/stack/xfire and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-20 11:24:12 -0400 (Fri, 20 Jul 2007) New Revision: 3961 Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java Log: More on cxf integration Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-20 14:46:18 UTC (rev 3960) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -30,10 +30,11 @@ import javax.management.ObjectName; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.xml.namespace.QName; import javax.xml.ws.Service; +import javax.xml.ws.handler.HandlerResolver; import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; import org.jboss.wsf.common.ObjectNameFactory; /** @@ -49,6 +50,9 @@ private static MBeanServerConnection server; private static String integrationTarget; + private static String implVendor; + private static String implTitle; + private static String implVersion; /** Deploy the given archive */ @@ -89,21 +93,35 @@ public boolean isIntegrationNative() { - String vendor = Service.class.getPackage().getImplementationVendor(); - return vendor.startsWith("JBoss"); + String vendor = getImplementationVendor(); + return vendor.indexOf("JBoss") != -1; } public boolean isIntegrationSunRI() { - String vendor = Service.class.getPackage().getImplementationVendor(); - return vendor.startsWith("Sun Microsystems"); + String vendor = getImplementationVendor(); + return vendor.indexOf("Sun") != -1; } public boolean isIntegrationXFire() { - throw new NotImplementedException(); + String vendor = getImplementationVendor(); + return vendor.indexOf("Apache") != -1; } + private String getImplementationVendor() + { + if (implVendor == null) + { + HandlerResolver resolver = Service.create(new QName("dummy")).getHandlerResolver(); + implVendor = resolver.getClass().getPackage().getImplementationVendor(); + implTitle = resolver.getClass().getPackage().getImplementationTitle(); + implVersion = resolver.getClass().getPackage().getImplementationVersion(); + System.out.println(implVendor + ", " + implTitle + ", " + implVersion); + } + return implVendor; + } + /** * Get the JBoss server host from system property "jboss.bind.address" * This defaults to "localhost" Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-20 14:46:18 UTC (rev 3960) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -39,12 +39,12 @@ import org.apache.cxf.transport.servlet.ServletController; import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.logging.Logger; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.framework.invocation.EndpointAssociation; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; 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-20 14:46:18 UTC (rev 3960) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -76,23 +76,29 @@ DDEndpoint ddep = new DDEndpoint(id, address, implementor); - if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) - ddep.setInvoker("InvokerBeanEJB3"); + if (depType == DeploymentType.JAXWS_EJB3) + { + ddep.setServiceFactory(ServiceFactoryBeanEJB3.class.getName()); + ddep.setInvoker(invokerEJB3); + } - if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) - ddep.setInvoker("InvokerBeanJSE"); + if (depType == DeploymentType.JAXWS_JSE) + { + ddep.setServiceFactory(ServiceFactoryBeanJSE.class.getName()); + ddep.setInvoker(invokerJSE); + } log.info("Add " + ddep); dd.addEndpoint(ddep); } - - if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) + + if (depType == DeploymentType.JAXWS_EJB3) { DDBean bean = new DDBean("InvokerBeanEJB3", invokerEJB3); dd.addBean(bean); } - if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) + if (depType == DeploymentType.JAXWS_JSE) { DDBean bean = new DDBean("InvokerBeanJSE", invokerJSE); dd.addBean(bean); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-20 14:46:18 UTC (rev 3960) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -26,14 +26,6 @@ import org.apache.cxf.message.Exchange; import org.apache.cxf.service.invoker.Invoker; -import org.codehaus.xfire.MessageContext; -import org.codehaus.xfire.fault.XFireFault; -import org.codehaus.xfire.service.invoker.Invoker; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.invocation.EndpointAssociation; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - /** * An XFire invoker for EJB3 * @@ -47,7 +39,7 @@ // TODO Auto-generated method stub return null; } - + /* public Object invoke(Method m, Object[] params, MessageContext context) { Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-07-20 14:46:18 UTC (rev 3960) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -38,6 +38,7 @@ private String address; private String implementor; private String invoker; + private String serviceFactory; public DDEndpoint(String id, String address, String implementor) { @@ -51,13 +52,27 @@ this.invoker = invoker; } + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + public void writeTo(Writer writer) throws IOException { writer.write("<jaxws:endpoint id='" + id + "' address='"+ address +"' implementor='" + implementor + "'>"); + //writer.write("<jaxws:implementor><bean class='" + implementor + "'/></jaxws:implementor>"); + + // [JBWS-1746] Add support for configurable invoker in cxf.xml + /* writer.write("<jaxws:properties>"); if (invoker != null) writer.write("<entry key='serviceFactory.invoker' value-ref='" + invoker + "'/>"); writer.write("</jaxws:properties>"); + */ + + //if (serviceFactory != null) + // writer.write("<jaxws:serviceFactory><bean class='" + serviceFactory + "'/></jaxws:serviceFactory>"); + writer.write("</jaxws:endpoint>"); } @@ -66,7 +81,8 @@ StringBuilder str = new StringBuilder("Service"); str.append("\n id=" + id); str.append("\n address=" + address); - str.append("\n invoker=" + invoker); + // str.append("\n invoker=" + invoker); + str.append("\n serviceFactory=" + serviceFactory); str.append("\n implementor=" + implementor); return str.toString(); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-07-20 14:46:18 UTC (rev 3960) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-07-20 15:24:12 UTC (rev 3961) @@ -48,13 +48,18 @@ { public static Test suite() { - //String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear"); - //return new JBossWSTestSetup(EarTestCase.class, earName); - return new JBossWSTestSetup(EarTestCase.class, "jaxws-samples-eardeployment.war"); + String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear"); + return new JBossWSTestSetup(EarTestCase.class, earName); } - public void _testEJB3Endpoint() throws Exception + public void testEJB3Endpoint() throws Exception { + if (isIntegrationXFire()) + { + System.out.println("FIXME: [JBWS-1746] - Add support for configurable invoker in cxf.xml"); + return; + } + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName);

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3960 - in trunk/integration/jboss40/src/main: resources and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-20 10:46:18 -0400 (Fri, 20 Jul 2007) New Revision: 3960 Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor Log: Missing updates to 40 integration Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-20 14:46:18 UTC (rev 3960) @@ -0,0 +1,81 @@ +/* + * 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.jboss40; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public class InvocationModelFactoryImpl extends InvocationModelFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + + public InvocationContext createInvocationContext(InvocationType type) + { + throw new IllegalArgumentException("Not implemented"); + } + + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer 2007-07-20 14:46:18 UTC (rev 3960) @@ -0,0 +1 @@ +org.jboss.ws.integration.jboss42.JBossHttpServer \ No newline at end of file Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-20 14:46:18 UTC (rev 3960) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss40.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-20 14:46:18 UTC (rev 3960) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.SecurityAdaptorImpl \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3958 - branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-20 06:22:32 -0400 (Fri, 20 Jul 2007) New Revision: 3958 Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java Log: Simplify service loading Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-20 08:25:33 UTC (rev 3957) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-20 10:22:32 UTC (rev 3958) @@ -23,9 +23,6 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.ServiceLoader; -import org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl; -import org.jboss.wsf.framework.deployment.WebXMLRewriterFactoryImpl; -import org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFException; @@ -63,40 +60,52 @@ // SPI provided by framework - if(spiType.equals(DeploymentModelFactory.class)) + if(DeploymentModelFactory.class.equals(spiType)) { - returnType = (T)new DeploymentModelFactoryImpl(); + returnType = (T) loadService( + spiType, "org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl" + ); } - else if (spiType.equals(ResourceInjectorFactory.class)) + else if (ResourceInjectorFactory.class.equals(spiType)) { - returnType = (T) new ResourceInjectorFactoryImpl(); + returnType = (T) loadService( + spiType, "org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl" + ); } - else if(spiType.equals(WebXMLRewriterFactory.class)) + else if(WebXMLRewriterFactory.class.equals(spiType)) { - returnType = (T) new WebXMLRewriterFactoryImpl(); + returnType = (T) loadService( + spiType, "org.jboss.wsf.framework.deployment.WebXMLRewriterFactoryImpl" + ); } // SPI provided by either container or stack integration - else if(spiType.equals(InvocationModelFactory.class)) + else if(InvocationModelFactory.class.equals(spiType)) { - // container integration needs to provide these - InvocationModelFactory factory = (InvocationModelFactory ) - ServiceLoader.loadService(InvocationModelFactory.class.getName(), null); - - if(null == factory) - throw new WSFException("Unable to load spi.invocation.InvocationModelFactory"); - - returnType = (T) factory; + returnType = (T) loadService(spiType, null); } // help debugging if(null == returnType) - log.debug("Failed to provide SPI '"+spiType+"'"); + throw new WSFException("Failed to provide SPI '"+spiType+"'"); else log.debug(spiType + " Implementation: " + returnType); return returnType; } + + /** + * Load SPI implementation through ServiceLoader + * @param spiType + * @param defaultImpl + * @return the spiType implementation + */ + private <T> T loadService(Class<T> spiType, String defaultImpl) + { + return (T) ServiceLoader.loadService(spiType.getName(), defaultImpl); + } } + + }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3957 - trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-20 04:25:33 -0400 (Fri, 20 Jul 2007) New Revision: 3957 Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java Log: Fix SessionContainer import Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-19 18:03:54 UTC (rev 3956) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-20 08:25:33 UTC (rev 3957) @@ -31,7 +31,7 @@ import org.jboss.ejb3.Container; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.SessionContainer; +import org.jboss.ejb3.session.SessionContainer; import org.jboss.ejb3.mdb.MessagingContainer; import org.jboss.ejb3.metamodel.Ejb3PortComponent; import org.jboss.ejb3.metamodel.EjbJarDD;

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3956 - in trunk: integration/jboss40/src/main/resources and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-19 14:03:54 -0400 (Thu, 19 Jul 2007) New Revision: 3956 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java Removed: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java Modified: trunk/build/version.properties trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml trunk/integration/xfire/version.properties trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java Log: Migrate to Apache-CXF Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/build/version.properties 2007-07-19 18:03:54 UTC (rev 3956) @@ -27,7 +27,7 @@ junit=3.8.1 stax-api=1.0 sun-jaf=1.1 -sun-jaxb=2.1.3 +sun-jaxb=2.1.4 sun-jaxrpc=1.1 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -89,6 +89,11 @@ <property name="provides">ContextRoot</property> </bean> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> <property name="provides">ContainerEndpointHandler</property> <property name="invocationHandler"> @@ -170,6 +175,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> @@ -186,6 +192,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -89,6 +89,11 @@ <property name="provides">ContextRoot</property> </bean> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> <property name="provides">ContainerEndpointHandler</property> <property name="invocationHandler"> @@ -169,6 +174,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> @@ -185,6 +191,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> 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-19 16:09:08 UTC (rev 3955) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -143,6 +143,11 @@ <property name="provides">ContextRoot</property> </bean> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> <property name="provides">ContainerEndpointHandler</property> <property name="invocationHandler"> @@ -213,6 +218,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> @@ -229,6 +235,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -42,6 +42,7 @@ private String shortName; private String urlPattern; private String targetBean; + private String address; private EndpointState state; private RequestHandler requestHandler; private InvocationHandler invocationHandler; @@ -135,6 +136,16 @@ this.urlPattern = urlPattern; } + public String getAddress() + { + return address; + } + + public void setAddress(String address) + { + this.address = address; + } + public EndpointState getState() { return state; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -90,6 +90,12 @@ /** Set the URL pattern for this endpoint */ void setURLPattern(String urlPattern); + /** Get endpoint address */ + String getAddress(); + + /** Set endpoint address */ + void setAddress(String address); + /** Set the request handler for this endpoint */ void setRequestHandler(RequestHandler handler); Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +//$Id: URLPatternDeployer.java 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ + +/** + * A deployer that assigns the endpoint address. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class EndpointAddressDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + String urlPattern = ep.getURLPattern(); + if (urlPattern == null) + throw new IllegalStateException("Cannot obtain url pattern"); + + if (urlPattern.endsWith("/*")) + urlPattern = urlPattern.substring(0, urlPattern.length() - 2); + + ep.setAddress(contextRoot + urlPattern); + } + } +} \ No newline at end of file Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/.classpath 2007-07-19 18:03:54 UTC (rev 3956) @@ -8,14 +8,16 @@ <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="thirdparty/xfire-all.jar" sourcepath="thirdparty/xfire-distribution-sources.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/spring.jar"/> - <classpathentry kind="lib" path="thirdparty/xbean.jar"/> - <classpathentry kind="lib" path="thirdparty/xbean-spring.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry kind="lib" path="thirdparty/cxf-incubator.jar" sourcepath="/home/tdiesler/Download/java/apache/cxf/apache-cxf-2.0-incubator-src.zip"/> + <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-context.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-beans.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-core.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-web.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -25,45 +25,21 @@  <target name="tests-init" depends="tests-classpath"> - -  - <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> - - <path id="sunri.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> - </path> - <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jdom.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - <path id="ws.stack.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <path refid="sunri.classpath"/> + <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jdom.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/neethi.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -42,6 +42,19 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/cxf-incubator.jar" dest="${thirdparty.dir}/cxf-incubator.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-javamail.jar" dest="${thirdparty.dir}/geronimo-javamail.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-ws-metadata.jar" dest="${thirdparty.dir}/geronimo-ws-metadata.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/neethi.jar" dest="${thirdparty.dir}/neethi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-beans.jar" dest="${thirdparty.dir}/spring-beans.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-context.jar" dest="${thirdparty.dir}/spring-context.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-core.jar" dest="${thirdparty.dir}/spring-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-web.jar" dest="${thirdparty.dir}/spring-web.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/XmlSchema.jar" dest="${thirdparty.dir}/XmlSchema.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> @@ -51,42 +64,29 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/jdom.jar" dest="${thirdparty.dir}/jdom.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/spring.jar" dest="${thirdparty.dir}/spring.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xbean.jar" dest="${thirdparty.dir}/xbean.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xbean-spring.jar" dest="${thirdparty.dir}/xbean-spring.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-init"> -  <path id="xfire.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/> <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/> <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-incubator.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/spring.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans.jar"/> + <pathelement location="${thirdparty.dir}/spring-context.jar"/> + <pathelement location="${thirdparty.dir}/spring-core.jar"/> </path> - <path id="xfire50.integration.classpath"> - <path refid="xfire.integration.classpath"/> - <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - </path> - </target> </project> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -57,7 +57,6 @@ <fileset dir="@{thirdpartylibs}"> <include name="jaxws-api.jar"/> <include name="saaj-api.jar"/> - <include name="xfire-jsr181-api.jar"/> </fileset> </copy> @@ -121,6 +120,7 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> + <include name="resolver.jar"/> </fileset> </copy> @@ -156,6 +156,7 @@ <fileset dir="${jboss42.home}/client"> <include name="jbossws-spi.jar"/> <include name="jbossws-jboss42.jar"/> + <include name="resolver.jar"/> </fileset>  Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/build.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -153,16 +153,15 @@ <include name="jaxrpc-api.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> + <include name="cxf-incubator.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> <include name="wsdl4j.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="spring.jar"/> + <include name="spring-bean.jar"/> + <include name="spring-core.jar"/> <include name="xbean.jar"/> - <include name="xbean-spring.jar"/> - <include name="xfire-all.jar"/> - <include name="xfire-jsr181-api.jar"/> </fileset> <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire.jar"/> @@ -205,20 +204,24 @@ <include name="jbossws-xfire.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> + <include name="cxf-incubator.jar"/> + <include name="geronimo-ws-metadata.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> + <include name="neethi.jar"/> <include name="wsdl4j.jar"/> + <include name="resolver.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="spring.jar"/> + <include name="spring-beans.jar"/> + <include name="spring-context.jar"/> + <include name="spring-core.jar"/> <include name="stax-api.jar"/> <include name="wstx.jar"/> <include name="xbean.jar"/> - <include name="xbean-spring.jar"/> - <include name="xfire-all.jar"/> - <include name="xfire-jsr181-api.jar"/> + <include name="XmlSchema.jar"/> </fileset> <fileset dir="${xfire.output.lib.dir}/jbossws-xfire42"> <include name="jbossws.beans/**"/> Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java (from rev 3949, trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -0,0 +1,160 @@ +/* + * 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; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.apache.cxf.transport.DestinationFactory; +import org.apache.cxf.transport.servlet.CXFServlet; +import org.apache.cxf.transport.servlet.ServletController; +import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.io.InputStreamResource; + +/** + * An extension to the CXF servlet + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class CXFServletExt extends CXFServlet +{ + public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; + + private static Logger log = Logger.getLogger(CXFServletExt.class); + + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + protected GenericApplicationContext childCtx; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + + // Init the Endpoint + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + String contextPath = servletConfig.getServletContext().getContextPath(); + endpoint = initServiceEndpoint(contextPath); + endpoint.addAttachment(ServletController.class, getController()); + } + + public ServletController createServletController() + { + ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory(); + return new ServletControllerExt(stf, this); + } + + protected void loadAdditionalConfig(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException + { + String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); + + InputStream is; + try + { + is = new URL(location).openStream(); + } + catch (IOException e) + { + throw new ServletException(e); + } + + if (is != null) + { + childCtx = new GenericApplicationContext(ctx); + XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); + reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); + reader.loadBeanDefinitions(new InputStreamResource(is, location)); + + childCtx.refresh(); + } + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + public void destroy() + { + if (childCtx != null) + childCtx.destroy(); + } + + /** Initialize the service endpoint + */ + protected Endpoint initServiceEndpoint(String contextPath) + { + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + Endpoint endpoint = null; + String servletName = getServletName(); + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = epRegistry.getEndpoint(sepId); + break; + } + } + + if (endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + + return endpoint; + } +} Added: 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 (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -0,0 +1,122 @@ +/* + * 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; + +//$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.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.stack.xfire.metadata.services.DDBean; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.services.DDEndpoint; + +/** + * A deployer that generates cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DescriptorDeploymentAspect extends DeploymentAspect +{ + // provide logging + private static final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class); + + private String invokerEJB3; + private String invokerJSE; + + public void setInvokerEJB3(String invokerEJB3) + { + this.invokerEJB3 = invokerEJB3; + } + + public void setInvokerJSE(String invokerJSE) + { + this.invokerJSE = invokerJSE; + } + + @Override + public void create(Deployment dep) + { + DeploymentType depType = dep.getType(); + if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) + throw new IllegalStateException("Unsupported deployment type: " + depType); + + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String id = ep.getShortName(); + String address = ep.getAddress(); + String implementor = ep.getTargetBeanName(); + + DDEndpoint ddep = new DDEndpoint(id, address, implementor); + + if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) + ddep.setInvoker("InvokerBeanEJB3"); + + if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) + ddep.setInvoker("InvokerBeanJSE"); + + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } + + if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) + { + DDBean bean = new DDBean("InvokerBeanEJB3", invokerEJB3); + dd.addBean(bean); + } + + if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) + { + DDBean bean = new DDBean("InvokerBeanJSE", invokerJSE); + dd.addBean(bean); + } + + dep.getContext().addAttachment(DDBeans.class, dd); + + String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; + Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + if (contextParams == null) + { + contextParams = new HashMap<String, String>(); + dep.getContext().setProperty(propKey, contextParams); + } + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, dd.createFileURL().toExternalForm()); + } + + @Override + public void destroy(Deployment dep) + { + DDBeans dd = dep.getContext().getAttachment(DDBeans.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } +} \ No newline at end of file Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -23,17 +23,9 @@ //$Id$ -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.service.invoker.Invoker; -import org.codehaus.xfire.MessageContext; -import org.codehaus.xfire.fault.XFireFault; -import org.codehaus.xfire.service.invoker.Invoker; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - /** * An XFire invoker for EJB3 * @@ -42,35 +34,43 @@ */ public class InvokerEJB3 implements Invoker { - public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + public Object invoke(Exchange arg0, Object arg1) { - Endpoint ep = EndpointAssociation.getEndpoint(); - InvocationHandler invHandler = ep.getInvocationHandler(); + // TODO Auto-generated method stub + return null; + } + + /* + public Object invoke(Method m, Object[] params, MessageContext context) + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); - Invocation inv = invHandler.createInvocation(); - inv.getInvocationContext().addAttachment(MessageContext.class, context); - inv.setJavaMethod(m); - inv.setArgs(params); + Invocation inv = invHandler.createInvocation(); + inv.getInvocationContext().addAttachment(MessageContext.class, context); + inv.setJavaMethod(m); + inv.setArgs(params); - Object retObj = null; - try - { - invHandler.invoke(ep, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } + Object retObj = null; + try + { + invHandler.invoke(ep, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } - return retObj; - } + return retObj; + } - private void handleException(Exception ex) throws XFireFault - { - if (ex instanceof InvocationTargetException) - throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + private void handleException(Exception ex) throws XFireFault + { + if (ex instanceof InvocationTargetException) + throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); - throw XFireFault.createFault(ex); - } + throw XFireFault.createFault(ex); + } + */ } \ No newline at end of file Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -25,10 +25,14 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.List; -import org.codehaus.xfire.MessageContext; -import org.codehaus.xfire.fault.XFireFault; -import org.codehaus.xfire.service.invoker.Invoker; +import org.apache.cxf.frontend.MethodDispatcher; +import org.apache.cxf.helpers.CastUtils; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.service.Service; +import org.apache.cxf.service.invoker.Invoker; +import org.apache.cxf.service.model.BindingOperationInfo; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.Invocation; @@ -36,22 +40,29 @@ import org.jboss.wsf.spi.invocation.InvocationHandler; /** - * An XFire invoker for JSE + * An CXF invoker for JSE * * @author Thomas.Diesler(a)jboss.org * @since 21-May-2007 */ public class InvokerJSE implements Invoker { - public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + public Object invoke(Exchange exchange, Object o) { + BindingOperationInfo bop = exchange.get(BindingOperationInfo.class); + MethodDispatcher md = (MethodDispatcher)exchange.get(Service.class).get(MethodDispatcher.class.getName()); + Method m = md.getMethod(bop); + + List<Object> paramList = CastUtils.cast((List<?>)o); + Object[] params = paramList.toArray(); + Endpoint ep = EndpointAssociation.getEndpoint(); InvocationHandler invHandler = ep.getInvocationHandler(); Invocation inv = invHandler.createInvocation(); InvocationContext invContext = inv.getInvocationContext(); //inv.getInvocationContext().addAttachment(WebServiceContext.class, new WebServiceContextJSE(context)); - invContext.addAttachment(MessageContext.class, context); + //invContext.addAttachment(MessageContext.class, context); inv.setJavaMethod(m); inv.setArgs(params); @@ -76,11 +87,13 @@ return beanClass.newInstance(); } - private void handleException(Exception ex) throws XFireFault + private void handleException(Exception ex) { + Throwable th = ex; if (ex instanceof InvocationTargetException) - throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + th = ((InvocationTargetException)ex).getTargetException(); - throw XFireFault.createFault(ex); + throw new RuntimeException(th); } + } \ No newline at end of file Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.codehaus.xfire.transport.http.XFireServletController; +import org.apache.cxf.transport.servlet.ServletController; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.wsf.spi.deployment.Endpoint; @@ -52,11 +52,11 @@ public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { - XFireServletController controller = ep.getAttachment(XFireServletController.class); + ServletController controller = ep.getAttachment(ServletController.class); if (controller == null) - throw new IllegalStateException("Cannot obtain XFire servlet controller"); + throw new IllegalStateException("Cannot obtain servlet controller"); - controller.doService(req, res); + controller.invoke(req, res); } public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java (from rev 3949, trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -0,0 +1,111 @@ +/* + * 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; + +//$Id$ + +import java.io.IOException; +import java.io.OutputStream; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.cxf.Bus; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.servlet.CXFServlet; +import org.apache.cxf.transport.servlet.ServletController; +import org.apache.cxf.transport.servlet.ServletDestination; +import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.transports.http.QueryHandler; +import org.apache.cxf.transports.http.QueryHandlerRegistry; +import org.jboss.logging.Logger; + +/** + * An extension to the CXF servlet controller + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class ServletControllerExt extends ServletController +{ + private static Logger log = Logger.getLogger(ServletControllerExt.class); + + private ServletTransportFactory transport; + private CXFServlet cxfServlet; + + public ServletControllerExt(ServletTransportFactory transport, CXFServlet servlet) + { + super(transport, servlet); + this.transport = transport; + this.cxfServlet = servlet; + } + + public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + { + try + { + // JBossWS always uses the request URI + EndpointInfo ei = new EndpointInfo(); + String address = req.getRequestURI(); + + ei.setAddress(address); + ServletDestination dest = (ServletDestination)transport.getDestinationForPath(ei.getAddress()); + if (dest == null) + throw new ServletException("Cannot obtain destination for: " + address); + + ei = dest.getEndpointInfo(); + Bus bus = cxfServlet.getBus(); + if (null != req.getQueryString() && req.getQueryString().length() > 0 && bus.getExtension(QueryHandlerRegistry.class) != null) + { + String ctxUri = address; //req.getPathInfo(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + + for (QueryHandler qh : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + { + if (qh.isRecognizedQuery(baseUri, ctxUri, ei)) + { + + res.setContentType(qh.getResponseContentType(baseUri, ctxUri)); + OutputStream out = res.getOutputStream(); + try + { + qh.writeResponse(baseUri, ctxUri, ei, out); + out.flush(); + return; + } + catch (Exception e) + { + throw new ServletException(e); + } + } + } + } + + invokeDestination(req, res, dest); + } + catch (IOException e) + { + throw new ServletException(e); + } + } +} Modified: 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-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -64,7 +64,7 @@ throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); + 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();) Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -1,184 +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; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.ws.WebServiceException; - -import org.codehaus.xfire.XFire; -import org.codehaus.xfire.XFireException; -import org.codehaus.xfire.spring.XFireConfigLoader; -import org.codehaus.xfire.transport.http.XFireConfigurableServlet; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; -import org.springframework.context.ApplicationContext; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.GenericWebApplicationContext; - -/** - * An extension to the XFire servlet - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireConfigurableServletExt extends XFireConfigurableServlet -{ - public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; - - private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; - - private static Logger log = Logger.getLogger(XFireConfigurableServletExt.class); - - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - - // Init the Endpoint - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - String contextPath = servletConfig.getServletContext().getContextPath(); - endpoint = initServiceEndpoint(contextPath); - endpoint.addAttachment(XFireServletController.class, controller); - } - - public XFire createXFire() throws ServletException - { - XFire xfire; - try - { - // #1 Load services.xml from default location - ServletContext context = getServletContext(); - URL servicesURL = context.getResource(CONFIG_FILE); - - // #1 Load services.xml from init parameter - if (servicesURL == null) - { - String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); - if (paramValue != null) - servicesURL = new URL(paramValue); - } - - xfire = loadConfig(servicesURL.getFile()); - } - catch (Exception e) - { - throw new ServletException(e); - } - - return xfire; - } - - public XFire loadConfig(String configPath) throws XFireException - { - XFireConfigLoader loader = new XFireConfigLoader(); - //loader.setBasedir(getWebappBase()); - //log.debug("Loading configuration files relative to " + loader.getBasedir().getAbsolutePath()); - - ServletContext servletCtx = getServletContext(); - ApplicationContext parent = (ApplicationContext) servletCtx.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); - - if (parent == null) - { - GenericWebApplicationContext webCtx = new GenericWebApplicationContextX(); - webCtx.setServletContext(getServletContext()); - webCtx.refresh(); - parent = webCtx; - } - - ApplicationContext newCtx = loader.loadContext(configPath, parent); - if(servletCtx.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null) - { - servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, newCtx); - } - - XFire xfire = (XFire) newCtx.getBean("xfire"); - xfire.setProperty(XFire.XFIRE_HOME, getWebappBase().getAbsolutePath()); - return xfire; - } - - public XFireServletController createController() throws ServletException - { - return new XFireServletControllerExt(xfire, getServletContext()); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** Initialize the service endpoint - */ - protected Endpoint initServiceEndpoint(String contextPath) - { - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); - - Endpoint endpoint = null; - String servletName = getServletName(); - for (ObjectName sepId : epRegistry.getEndpoints()) - { - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = epRegistry.getEndpoint(sepId); - break; - } - } - - if (endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," - + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); - throw new WebServiceException("Cannot obtain endpoint for: " + oname); - } - - return endpoint; - } -} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -1,124 +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; - -//$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.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.stack.xfire.metadata.services.DDBean; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; -import org.jboss.wsf.stack.xfire.metadata.services.DDService; - -/** - * A deployer that generates xfire services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class XFireServicesDeploymentAspect extends DeploymentAspect -{ - // provide logging - private static final Logger log = Logger.getLogger(XFireServicesDeploymentAspect.class); - - private String serviceFactory; - private String invokerEJB3; - private String invokerJSE; - - public void setServiceFactory(String serviceFactory) - { - this.serviceFactory = serviceFactory; - } - - public void setInvokerEJB3(String invokerEJB3) - { - this.invokerEJB3 = invokerEJB3; - } - - public void setInvokerJSE(String invokerJSE) - { - this.invokerJSE = invokerJSE; - } - - @Override - public void create(Deployment dep) - { - DeploymentType depType = dep.getType(); - if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) - throw new IllegalStateException("Unsupported deployment type: " + depType); - - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String epName = ep.getShortName(); - String targetBean = ep.getTargetBeanName(); - - DDService ddser = new DDService(epName, targetBean); - ddser.setServiceFactory(serviceFactory); - - if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) - { - String beanName = "InvokerBeanEJB3"; - dd.addBean(new DDBean(beanName, invokerEJB3)); - ddser.setInvoker("#" + beanName); - } - - if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) - { - String beanName = "InvokerBeanJSE"; - dd.addBean(new DDBean(beanName, invokerJSE)); - ddser.setInvoker("#" + beanName); - } - - log.info("Add " + ddser); - dd.addService(ddser); - } - dep.getContext().addAttachment(DDBeans.class, dd); - - String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); - if (contextParams == null) - { - contextParams = new HashMap<String, String>(); - dep.getContext().setProperty(propKey, contextParams); - } - contextParams.put(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL, dd.createFileURL().toExternalForm()); - } - - - @Override - public void destroy(Deployment dep) - { - DDBeans dd = dep.getContext().getAttachment(DDBeans.class); - if (dd != null) - { - dd.destroyFileURL(); - } - } -} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -1,127 +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; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.codehaus.xfire.XFire; -import org.codehaus.xfire.service.Service; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; - -/** - * An extension to the XFire servlet controller - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireServletControllerExt extends XFireServletController -{ - private static Logger log = Logger.getLogger(XFireServletControllerExt.class); - - public XFireServletControllerExt(XFire xfire, ServletContext servletContext) - { - super(xfire, servletContext); - } - - protected String getService(HttpServletRequest request) - { - Endpoint ep = EndpointAssociation.getEndpoint(); - String serviceName = ep.getShortName(); - return serviceName; - } - - protected void generateWSDL(HttpServletResponse response, String service) throws ServletException, IOException - { - Service userService = getXFire().getServiceRegistry().getService(service); - Object value = userService.getProperty(Service.DISABLE_WSDL_GENERATION); - boolean isWSDLDisabled = "true".equalsIgnoreCase((value != null ? value.toString() : null)); - if (isWSDLDisabled) - { - log.warn("WSDL generation disabled for service :" + service); - response.sendError(404, "No wsdl is avaiable for this service"); - return; - } - - response.setStatus(200); - response.setContentType("text/xml"); - - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - try - { - Endpoint ep = EndpointAssociation.getEndpoint(); - UnifiedVirtualFile rootFile = ep.getService().getDeployment().getRootFile(); - Thread.currentThread().setContextClassLoader(new VirtualFileClassLoader(rootFile, ctxLoader)); - getXFire().generateWSDL(service, response.getOutputStream()); - } - finally - { - Thread.currentThread().setContextClassLoader(ctxLoader); - } - } - - /* - * For some reason WebAppClassLoader.getResource("WEB-INF/wsdl/TestEndpoint.wsdl") - * fails when the war is deployed as part of an ear deployment. - * - * This ClassLoader falls back to the VFS to find the resource URL. - */ - static class VirtualFileClassLoader extends ClassLoader - { - private UnifiedVirtualFile vFile; - - public VirtualFileClassLoader(UnifiedVirtualFile file, ClassLoader parent) - { - super(parent); - vFile = file; - } - - @Override - public URL getResource(String name) - { - URL url = super.getResource(name); - if (url == null) - { - try - { - url = vFile.findChild(name).toURL(); - } - catch (IOException e) - { - // ignore - } - } - return url; - } - } -} Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -27,16 +27,14 @@ import java.io.Writer; /** - * Metadata model for services.xml + * Metadata model for cxf.xml * * @author Thomas.Diesler(a)jboss.org * @since 21-May-2007 */ public class DDBean { - // This will be the name bean. Required. private String beanName; - // The class name of the bean. Required. private String beanClass; public DDBean(String beanName, String beanClass) @@ -45,30 +43,11 @@ this.beanClass = beanClass; } - public String getBeanName() - { - return beanName; - } - - public void setBeanName(String beanName) - { - this.beanName = beanName; - } - - public String getBeanClass() - { - return beanClass; - } - - public void setBeanClass(String beanClass) - { - this.beanClass = beanClass; - } - public void writeTo(Writer writer) throws IOException { writer.write("<bean"); - writer.write(" name='" + beanName + "'"); + if (beanName != null) + writer.write(" name='" + beanName + "'"); writer.write(" class='" + beanClass + "'"); writer.write("></bean>"); } Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -38,7 +38,7 @@ //$Id$ /** - * Metadata model for xfire services.xml + * Metadata model for cxf.xml * * @author Thomas.Diesler(a)jboss.org * @since 21-May-2007 @@ -46,20 +46,20 @@ public class DDBeans { // The Required services. - private List<DDService> services = new ArrayList<DDService>(); + private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); // Optional additional beans. private List<DDBean> beans = new ArrayList<DDBean>(); // The derived temp file private File tmpFile; - public List<DDService> getServices() + public List<DDEndpoint> getEndpoints() { - return services; + return endpoints; } - public void addService(DDService service) + public void addEndpoint(DDEndpoint service) { - services.add(service); + endpoints.add(service); } public List<DDBean> getBeans() @@ -79,7 +79,7 @@ try { File tmpDir = IOUtils.createTempDirectory(); - tmpFile = File.createTempFile("jbossws-xfire-services", ".xml", tmpDir); + tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir); Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); writeTo(writer); writer.close(); @@ -103,10 +103,19 @@ public void writeTo(Writer writer) throws IOException { - writer.write("<beans xmlns='http://xfire.codehaus.org/config/1.0'>"); - for (DDService service : services) + writer.write("<beans " + + "xmlns='http://www.springframework.org/schema/beans' " + + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + + "xmlns:beans='http://www.springframework.org/schema/beans' " + + "xmlns:jaxws='http://cxf.apache.org/jaxws' " + + "xsi:schemaLocation='http://www.springframework.org/schema/beans " + + "http://www.springframework.org/schema/beans/spring-beans.xsd " + + "http://cxf.apache.org/jaxws " + + "http://cxf.apache.org/schemas/jaxws.xsd'>"); + + for (DDEndpoint endpoint : endpoints) { - service.writeTo(writer); + endpoint.writeTo(writer); } for (DDBean bean : beans) { Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java (from rev 3949, trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -0,0 +1,73 @@ +/* + * 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.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDEndpoint +{ + private String id; + private String address; + private String implementor; + private String invoker; + + public DDEndpoint(String id, String address, String implementor) + { + this.id = id; + this.address = address; + this.implementor = implementor; + } + + public void setInvoker(String invoker) + { + this.invoker = invoker; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<jaxws:endpoint id='" + id + "' address='"+ address +"' implementor='" + implementor + "'>"); + writer.write("<jaxws:properties>"); + if (invoker != null) + writer.write("<entry key='serviceFactory.invoker' value-ref='" + invoker + "'/>"); + writer.write("</jaxws:properties>"); + writer.write("</jaxws:endpoint>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Service"); + str.append("\n id=" + id); + str.append("\n address=" + address); + str.append("\n invoker=" + invoker); + str.append("\n implementor=" + implementor); + return str.toString(); + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -1,131 +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.metadata.services; - -//$Id$ - -import java.io.IOException; -import java.io.Writer; - -/** - * Metadata model for services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDService -{ - // This will be the name of the service as exposed to the world. Required. - private String name; - // The class name of the object you wish to make into a service. Required. - private String serviceClass; - // The class name of the implementation which you wish to use when the service is invoked. Optional. - private String implementationClass; - // The ServiceFactory controls how the Service is built and configured. Optional. - private String serviceFactory; - // The invoker element is optional. It can be used to set a non-default Invoker for a service. - private String invoker; - - public DDService(String name, String serviceClass) - { - this.name = name; - this.serviceClass = serviceClass; - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getServiceClass() - { - return serviceClass; - } - - public void setServiceClass(String serviceClass) - { - this.serviceClass = serviceClass; - } - - public String getImplementationClass() - { - return implementationClass; - } - - public void setImplementationClass(String implementationClass) - { - this.implementationClass = implementationClass; - } - - public String getServiceFactory() - { - return serviceFactory; - } - - public void setServiceFactory(String serviceFactory) - { - this.serviceFactory = serviceFactory; - } - - public String getInvoker() - { - return invoker; - } - - public void setInvoker(String invoker) - { - this.invoker = invoker; - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<service>"); - writer.write("<name>" + name + "</name>"); - writer.write("<serviceClass>" + serviceClass + "</serviceClass>"); - if (implementationClass != null) - writer.write("<implementationClass>" + implementationClass + "</implementationClass>"); - if (serviceFactory != null) - writer.write("<serviceFactory>" + serviceFactory + "</serviceFactory>"); - if (invoker != null) - writer.write("<invoker>" + invoker + "</invoker>"); - writer.write("</service>"); - } - - public String toString() - { - StringBuilder str = new StringBuilder("Service"); - str.append("\n name=" + name); - str.append("\n serviceClass=" + serviceClass); - if (implementationClass != null) - str.append("\n implementationClass=" + implementationClass); - if (serviceFactory != null) - str.append("\n serviceFactory=" + serviceFactory); - if (invoker != null) - str.append("\n invoker=" + invoker); - return str.toString(); - } -} \ 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-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-19 18:03:54 UTC (rev 3956) @@ -29,47 +29,47 @@  - <bean name="WSXFireContextPropertiesDeploymentAspect" class="org.jboss.wsf.spi.deployment.ContextPropertiesDeploymentAspect"> + <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.spi.deployment.ContextPropertiesDeploymentAspect"> <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.XFireConfigurableServletExt</value></entry> + <entry><key>ServletClass</key><value>org.jboss.wsf.stack.xfire.CXFServletExt</value></entry> </map> </property> </bean> - <bean name="WSXFireEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> + <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerEndpointHandler</property> <property name="provides">StackEndpointHandler</property> <property name="requestHandler">org.jboss.wsf.stack.xfire.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.wsf.stack.xfire.LifecycleHandlerImpl</property> </bean> - <bean name="WSXFireServicesDeploymentAspect" class="org.jboss.wsf.stack.xfire.XFireServicesDeploymentAspect"> + <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.xfire.DescriptorDeploymentAspect"> + <property name="requires">EndpointAddress</property> <property name="provides">StackDescriptor</property> - <property name="serviceFactory">org.codehaus.xfire.jaxws.JAXWSServiceFactory</property> <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property> <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property> </bean>  - <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSXFireContextPropertiesDeploymentAspect"/> - <inject bean="WSXFireEndpointHandlerDeploymentAspect"/> - <inject bean="WSXFireServicesDeploymentAspect"/> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> </set> </property> </bean> - <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSXFireContextPropertiesDeploymentAspect"/> - <inject bean="WSXFireEndpointHandlerDeploymentAspect"/> - <inject bean="WSXFireServicesDeploymentAspect"/> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> </set> </property> </bean> Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/integration/xfire/version.properties 2007-07-19 18:03:54 UTC (rev 3956) @@ -1,11 +1,12 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -sunri.implementation.title=JBoss Web Services - JBossWS/XFire +sunri.implementation.title=JBoss Web Services - Apache CXF # Thirdparty library versions +apache-cxf=2.0 +apache-xml-commons=1.2 ibm-wsdl4j=1.6.2 jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta -xfire=1.2.6 Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-07-19 16:09:08 UTC (rev 3955) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-07-19 18:03:54 UTC (rev 3956) @@ -48,11 +48,12 @@ { public static Test suite() { - String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear"); - return new JBossWSTestSetup(EarTestCase.class, earName); + //String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear"); + //return new JBossWSTestSetup(EarTestCase.class, earName); + return new JBossWSTestSetup(EarTestCase.class, "jaxws-samples-eardeployment.war"); } - public void testEJB3Endpoint() throws Exception + public void _testEJB3Endpoint() throws Exception { String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService");

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3955 - in branches/hbraun/trunk: integration/spi/src/main/java/org/jboss/wsf/framework and 4 other directories.

by jbossws-commits＠lists.jboss.org

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

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3954 - in branches/hbraun/trunk: integration/jboss40/src/main/resources and 9 other directories.

by jbossws-commits＠lists.jboss.org

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

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3953 - in branches/hbraun/trunk: integration/jboss40/src/main/resources and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-19 10:34:04 -0400 (Thu, 19 Jul 2007) New Revision: 3953 Added: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory Removed: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java Modified: branches/hbraun/trunk/hbraun-trunk.iws branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml branches/hbraun/trunk/integration/jboss42/int-42.iml branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml branches/hbraun/trunk/integration/jboss50/int-50.iml branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java Log: Add WebServiceContext creation to InvocationModelFactory Modified: branches/hbraun/trunk/hbraun-trunk.iws =================================================================== --- branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 14:34:04 UTC (rev 3953) @@ -132,6 +132,19 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java" line="272" class="org.jboss.ws.core.server.ServiceEndpointInvoker" package="org.jboss.ws.core.server"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -186,7 +199,50 @@ <option name="myCurrentFavoritesList" value=".ipr" /> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="WebServiceContextEJB.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ServiceEndpointInvoker.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -217,8 +273,8 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-50" /> - <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> + <option name="LAST_EDITED_TAB_NAME" value="Dependencies" /> </component> <component name="NamedScopeManager" /> <component name="PackagesPane"> @@ -300,7 +356,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="deployment" /> + <option name="myItemId" value="invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -348,7 +404,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="deployment" /> + <option name="myItemId" value="invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -376,10 +432,48 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jbossws-core" /> + <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="hbraun-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.jboss.wsf.stack.jbws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org.jboss.wsf.container.jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -574,9 +668,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -611,6 +709,14 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -636,7 +742,7 @@ </PATH> </component> <component name="ProjectReloadState"> - <option name="STATE" value="2" /> + <option name="STATE" value="0" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" splitterProportion="0.5"> @@ -668,15 +774,16 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.invocation" /> <recent name="org.jboss.wsf.test" /> <recent name="org.jboss.test.ws.jaxws.webserviceref" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.invocation" /> + <recent name="org.jboss.wsf.framework.invocation" /> + <recent name="org.jboss.wsf.stack.jbws" /> + <recent name="org.jboss.wsf.container.jboss50" /> <recent name="org.jboss.wsf.common.log" /> - <recent name="org.jboss.wsf.common" /> - <recent name="org.jboss.wsf.spi.deployment" /> - <recent name="org.jboss.ws.integration" /> - <recent name="org.jboss.wsf.framework.deployment" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -698,6 +805,18 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> + <configuration selected="false" default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -714,18 +833,6 @@ <value defaultName="wholeProject" /> </option> </configuration> - <configuration selected="false" default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> <configuration selected="true" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -799,12 +906,12 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33415535" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5200458" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.27928483" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.44673538" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24969174" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> @@ -813,9 +920,9 @@ <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24907522" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.21763255" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.49714938" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.49713632" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> @@ -889,120 +996,128 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="66" selection-start="2850" selection-end="2850" vertical-scroll-proportion="1.2848485"> + <state line="82" column="20" selection-start="2777" selection-end="2777" vertical-scroll-proportion="0.85365856"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="1390" selection-end="1390" vertical-scroll-proportion="0.2682927"> - <folding /> + <state line="61" column="15" selection-start="1508" selection-end="1807" vertical-scroll-proportion="1.6619385"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="28" selection-start="1299" selection-end="1299" vertical-scroll-proportion="0.5090909"> + <state line="47" column="22" selection-start="1763" selection-end="1763" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvider.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.21428572"> - <folding /> + <state line="125" column="12" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.45341614"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvision.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="3" selection-start="1126" selection-end="1126" vertical-scroll-proportion="0.14285715"> - <folding /> + <state line="31" column="57" selection-start="1272" selection-end="1272" vertical-scroll-proportion="0.2682927"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1189" selection-end="1189" vertical-scroll-proportion="0.2195122"> - <folding /> + <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.32298136"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="58" selection-start="1391" selection-end="1391" vertical-scroll-proportion="0.29268292"> + <state line="131" column="57" selection-start="5156" selection-end="5156" vertical-scroll-proportion="0.5031056"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="10" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.6585366"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="43" column="22" selection-start="1724" selection-end="1724" vertical-scroll-proportion="0.14634146"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="30" selection-start="2805" selection-end="2805" vertical-scroll-proportion="0.78571427"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="50" column="54" selection-start="1999" selection-end="1999" vertical-scroll-proportion="0.3341615"> + <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$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="10" selection-start="1793" selection-end="1793" vertical-scroll-proportion="0.7204969"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="45" column="22" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33292684"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="13" selection-start="1715" selection-end="1715" vertical-scroll-proportion="0.3416149"> + <state line="43" column="4" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.34146342"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="13" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.3151515"> + <state line="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="20" selection-start="1396" selection-end="1396" vertical-scroll-proportion="0.30952382"> - <folding /> + <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="15" selection-start="1708" selection-end="1708" vertical-scroll-proportion="0.8208955"> - <folding /> + <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="51" column="13" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.61904764"> - <folding /> + <state line="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> Modified: branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -95,7 +95,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry> </map> </property> Modified: branches/hbraun/trunk/integration/jboss42/int-42.iml =================================================================== --- branches/hbraun/trunk/integration/jboss42/int-42.iml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/int-42.iml 2007-07-19 14:34:04 UTC (rev 3953) @@ -8,9 +8,28 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="jboss-system" level="project" /> <orderEntry type="module" module-name="spi" /> <orderEntry type="library" name="jboss-logging-spi" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="42-server" /> + <orderEntry type="module" module-name="42-system" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/ejb3.deployer/jboss-ejb3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,15 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.security.Principal; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; - import org.jboss.ejb.EjbModule; import org.jboss.ejb.Interceptor; import org.jboss.ejb.StatelessSessionContainer; @@ -40,24 +31,28 @@ import org.jboss.invocation.PayloadKey; import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.HandlerCallback; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.common.ObjectNameFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; +import java.security.Principal; + /** * Handles invocations on EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB21 extends BasicInvocationHandler +public class InvocationHandlerEJB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); @@ -66,10 +61,13 @@ private MBeanServer server; private ObjectName objectName; - public void create(Endpoint ep) + public Invocation createInvocation() { - super.create(ep); + return new Invocation(); + } + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.lang.reflect.Method; - -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; - import org.jboss.aop.Dispatcher; import org.jboss.aop.MethodInfo; import org.jboss.ejb3.BeanContext; @@ -37,27 +31,35 @@ import org.jboss.ejb3.stateless.StatelessBeanContext; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; + /** * Handles invocations on EJB3 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB3 extends BasicInvocationHandler +public class InvocationHandlerEJB3 extends InvocationHandler { private ObjectName objectName; - public void create(Endpoint ep) + public Invocation createInvocation() { - super.create(ep); + return new Invocation(); + } + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; @@ -67,12 +69,7 @@ } objectName = ObjectNameFactory.create(nameStr.toString()); - } - public void start(Endpoint ep) - { - super.start(ep); - Dispatcher dispatcher = Dispatcher.singleton; if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) throw new WebServiceException("Cannot find service endpoint target: " + objectName); @@ -125,7 +122,10 @@ if (beanProp != null) { EJBContext ejbCtx = beanCtx.getEJBContext(); - beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + wsContext.addAttachment(EJBContext.class, ejbCtx); + beanProp.set(beanCtx.getInstance(), wsContext); } } Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,25 +23,35 @@ // $Id: InvocationHandlerEJB21.java 3524 2007-06-09 17:28:37Z thomas.diesler(a)jboss.com $ -import java.lang.reflect.Method; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import java.lang.reflect.Method; + /** * Handles invocations on MDB EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerMDB21 extends BasicInvocationHandler +public class InvocationHandlerMDB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class); + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + + } + public void invoke(Endpoint ep, Invocation epInv) throws Exception { log.debug("Invoke: " + epInv.getJavaMethod().getName()); Added: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1,48 @@ +/* + * 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.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationModelFactoryImpl extends InvocationModelFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + throw new IllegalArgumentException("Not implemented"); + } + + public InvocationContext createInvocationContext(InvocationType type) + { + throw new IllegalArgumentException("Not implemented"); + } + + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + throw new IllegalArgumentException("Not implemented"); + } +} Property changes on: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -95,7 +95,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> Added: branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory (rev 0) +++ branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.InvocationModelFactoryImpl \ No newline at end of file Modified: branches/hbraun/trunk/integration/jboss50/int-50.iml =================================================================== --- branches/hbraun/trunk/integration/jboss50/int-50.iml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/int-50.iml 2007-07-19 14:34:04 UTC (rev 3953) @@ -509,6 +509,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,15 +21,15 @@ */ package org.jboss.wsf.container.jboss50; -import java.util.LinkedList; -import java.util.List; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer; import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; +import java.util.LinkedList; +import java.util.List; + //$Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,28 +23,20 @@ // $Id$ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; +import org.jboss.metadata.*; import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; import org.jboss.metadata.ApplicationMetaData.Webservices; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * Build container independent application meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,31 +23,23 @@ // $Id$ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb3.Container; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.SessionContainer; import org.jboss.ejb3.mdb.MessagingContainer; -import org.jboss.ejb3.metamodel.Ejb3PortComponent; -import org.jboss.ejb3.metamodel.EjbJarDD; -import org.jboss.ejb3.metamodel.EnterpriseBean; -import org.jboss.ejb3.metamodel.WebserviceDescription; -import org.jboss.ejb3.metamodel.Webservices; +import org.jboss.ejb3.metamodel.*; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * Build container independent application meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,24 +23,24 @@ //$Id$ -import java.net.URL; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; +import java.net.URL; + /** * An abstract web service deployer. * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,9 +21,6 @@ */ package org.jboss.wsf.container.jboss50; -import java.net.URL; -import java.net.URLClassLoader; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; @@ -33,6 +30,9 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import java.net.URL; +import java.net.URLClassLoader; + // $Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,15 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.security.Principal; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; - import org.jboss.ejb.EjbModule; import org.jboss.ejb.Interceptor; import org.jboss.ejb.StatelessSessionContainer; @@ -42,24 +33,28 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.security.SecurityContext; import org.jboss.security.plugins.SecurityContextAssociation; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.HandlerCallback; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.common.ObjectNameFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; +import java.security.Principal; + /** - * Handles invocations on EJB3 endpoints. + * Handles invocations on EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB21 extends BasicInvocationHandler +public class InvocationHandlerEJB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); @@ -68,10 +63,17 @@ private MBeanServer server; private ObjectName objectName; - public void create(Endpoint ep) + InvocationHandlerEJB21() { - super.create(ep); + } + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.lang.reflect.Method; - -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; - import org.jboss.aop.Dispatcher; import org.jboss.aop.MethodInfo; import org.jboss.ejb3.BeanContext; @@ -37,25 +31,39 @@ import org.jboss.ejb3.stateless.StatelessBeanContext; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; + /** * Handles invocations on EJB3 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB3 extends BasicInvocationHandler +public class InvocationHandlerEJB3 extends InvocationHandler { private ObjectName objectName; - public void create(Endpoint ep) + InvocationHandlerEJB3() { + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; @@ -65,12 +73,7 @@ } objectName = ObjectNameFactory.create(nameStr.toString()); - } - public void start(Endpoint ep) - { - super.start(ep); - Dispatcher dispatcher = Dispatcher.singleton; if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) throw new WebServiceException("Cannot find service endpoint target: " + objectName); @@ -123,7 +126,10 @@ if (beanProp != null) { EJBContext ejbCtx = beanCtx.getEJBContext(); - beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + wsContext.addAttachment(EJBContext.class, ejbCtx); + beanProp.set(beanCtx.getInstance(), wsContext); } } Added: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1,82 @@ +/* + * 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.invocation.*; +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; + +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +/** + * The default invocation model factory fro AS 5.0. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationModelFactoryImpl extends InvocationModelFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + + public InvocationContext createInvocationContext(InvocationType type) + { + return null; + } + + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -28,9 +28,9 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -28,9 +28,9 @@ import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,20 @@ //$Id$ -import java.util.Iterator; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.Iterator; + /** * A deployer JAXWS EJB3 Endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,20 @@ //$Id$ -import java.util.ArrayList; -import java.util.List; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.ArrayList; +import java.util.List; + /** * A deployer JAXWS JSE Endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -25,7 +25,6 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.container.jboss50.AbstractDeployerHook; import org.jboss.wsf.spi.deployment.Deployment; /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,20 +23,20 @@ //$Id: ModifyWebMetaDataDeployer.java 3150 2007-05-20 00:29:48Z thomas.diesler(a)jboss.com $ -import java.util.Iterator; -import java.util.Map; - import org.jboss.metadata.Listener; import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; +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; -import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; +import java.util.Iterator; +import java.util.Map; + /** * A deployer that modifies the web.xml meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,11 +23,11 @@ // $Id$ -import java.security.Principal; - import org.jboss.security.SecurityAssociation; import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import java.security.Principal; + /** * A JBoss specific SecurityAssociationAdaptor * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,9 +23,6 @@ //$Id$ -import java.util.Iterator; -import java.util.Map; - import org.dom4j.Element; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.AssemblyDescriptorMetaData; @@ -33,6 +30,9 @@ import org.jboss.wsf.spi.deployment.SecurityHandler; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import java.util.Iterator; +import java.util.Map; + /** * Generate a service endpoint deployment for EJB endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,10 +23,6 @@ //$Id$ -import java.util.Iterator; - -import javax.annotation.security.RolesAllowed; - import org.dom4j.Element; import org.jboss.annotation.security.SecurityDomain; import org.jboss.ejb3.EJBContainer; @@ -34,6 +30,9 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.SecurityHandler; +import javax.annotation.security.RolesAllowed; +import java.util.Iterator; + /** * Generate a service endpoint deployment for EJB endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,8 +23,6 @@ // $Id$ -import javax.xml.rpc.handler.soap.SOAPMessageContext; - import org.jboss.ejb.plugins.AbstractInterceptor; import org.jboss.invocation.InvocationKey; import org.jboss.logging.Logger; @@ -32,6 +30,8 @@ import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import javax.xml.rpc.handler.soap.SOAPMessageContext; + /** * This Interceptor does the ws4ee handler processing. * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -24,11 +24,7 @@ //$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.JAXRPCDeployment; -import org.jboss.wsf.spi.deployment.JAXWSDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.*; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,12 +21,12 @@ */ package org.jboss.wsf.container.jboss50; +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; + import java.io.IOException; import java.net.URL; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; - // $Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,21 @@ // $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.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + /** * Publish the HTTP service endpoint to Tomcat * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployment.J2eeApplicationMetaData; import org.jboss.deployment.J2eeModuleMetaData; @@ -40,10 +34,12 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import java.util.*; + /** * Build container independent web meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -144,14 +144,7 @@ </bean> <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="provides">ContainerEndpointHandler</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> - </map> - </property> + <property name="provides">ContainerEndpointHandler</property> </bean> <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> Added: branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory (rev 0) +++ branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.InvocationModelFactoryImpl \ No newline at end of file Deleted: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java =================================================================== --- branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -1,74 +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.jbws; - -// $Id$ - -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; - -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.framework.invocation.InvocationHandlerJSE; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE -{ - @Override - public void invoke(Endpoint ep, Invocation epInv) throws Exception - { - try - { - Object targetBean = getTargetBean(ep, epInv); - - InvocationContext invContext = epInv.getInvocationContext(); - if (targetBean instanceof ServiceLifecycle) - { - ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); - if (sepContext != null) - ((ServiceLifecycle)targetBean).init(sepContext); - } - - try - { - super.invoke(ep, epInv); - } - finally - { - if (targetBean instanceof ServiceLifecycle) - { - ((ServiceLifecycle)targetBean).destroy(); - } - } - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Modified: branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -68,7 +68,7 @@ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXRPC</value></entry> </map> </property> </bean> Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,23 +23,23 @@ // $Id$ -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.EndpointInvocation; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.framework.invocation.BasicEndpointInvocation; +import org.jboss.wsf.spi.invocation.Invocation; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPMessage; + /** An invocation that delegates to the jbossws-core EndpointInvocation * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class DelegatingInvocation extends BasicEndpointInvocation +public class DelegatingInvocation extends Invocation { private EndpointInvocation getEndpointInvocation() { Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,31 +23,9 @@ // $Id$ -import java.lang.reflect.Method; -import java.util.HashMap; - -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; - import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.core.CommonBinding; -import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.ws.core.DirectionHolder; -import org.jboss.ws.core.EndpointInvocation; -import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.*; import org.jboss.ws.core.DirectionHolder.Direction; import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl; import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC; @@ -64,16 +42,28 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.framework.invocation.WebServiceContextDummy; -import org.jboss.wsf.framework.invocation.WebServiceContextJSE; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.common.JavaUtils; +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.http.HTTPBinding; +import java.lang.reflect.Method; +import java.util.HashMap; + /** An implementation handles invocations on the endpoint * * @author Thomas.Diesler(a)jboss.org @@ -288,11 +278,17 @@ WebServiceContext wsContext; if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) { - wsContext = new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext( + InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext + ); } else { - wsContext = new WebServiceContextDummy((SOAPMessageContextJAXWS)msgContext); + // TODO: This is an ESB case, they require a custom MessageContext + // that works independed of MessageContext.SERVLET_REQUEST + throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+ + "You should provide a custom spi.invocation.InvocationModelFactory"); } invContext.addAttachment(WebServiceContext.class, wsContext); } Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,19 +23,19 @@ // $Id$ +import org.jboss.wsf.spi.invocation.InvocationContext; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.jboss.wsf.framework.invocation.BasicInvocationContext; - /** * Implementation of ServletEndpointContext * * @author Thomas.Diesler(a)jboss.org */ -public class ServletRequestContext extends BasicInvocationContext +public class ServletRequestContext extends InvocationContext { private ServletContext context; private HttpServletRequest request;

17 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2007