May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7091 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-19 06:40:29 -0400 (Mon, 19 May 2008) New Revision: 7091 Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: copy from jbossws-501 (WIP) Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-19 10:00:43 UTC (rev 7090) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-19 10:40:29 UTC (rev 7091) @@ -4,168 +4,252 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.WSFRuntimeDelegateHttpServer"/> +  - There are two deployers registered with the JBoss Main Deployer. - The order of which is important + <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">WebserviceJSERuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> + <property name="transportManagerFactory"><inject bean="JSETransportManagerFactory"/></property> + <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> + <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property> + </bean> - 1) EJBDeployer < WebServiceDeployerEJB - 2) WebServiceDeployerPreJSE < WarDeployer - 3) WarDeployer < WebServiceDeployerPostJSE + <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">WebserviceEJBRuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> + <property name="transportManagerFactory"><inject bean="EJBTransportManagerFactory"/></property> + <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> + <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property> + </bean> - Each WebServiceDeployer has a number of DeployerHooks registered with it + <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">EndpointAPIRuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> + <property name="transportManagerFactory"><inject bean="EndpointAPITransportManagerFactory"/></property> + <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> + <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property> + </bean> - - WebServiceDeployerEJB - - WSDeployerHook_JAXRPC_EJB21 - - WSDeployerHook_JAXWS_EJB3 +  - - WebServiceDeployerPreJSE - - WSDeployerHook_JAXRPC_JSE - - WSDeployerHook_JAXWS_JSE +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> - Conceptually, each of these hooks implements the following pattern: +  + <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="JSEHttpTransport"/></property> + </bean> - DeployerHook.deploy(unit) - if(isWebServiceDeployment) - Deployment dep = createDeployment(unit) - DeploymentAspectManager.deploy(dep) +  + <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="EJBHttpTransport"/></property> + </bean> - DeployerHook.undeploy(unit) - Deployment dep = getDeployment(unit) - DeploymentAspectManager.undeploy(dep) +  + <bean name="EndpointAPITransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="EndpointAPIHttpTransport"/></property> + </bean> - Each deployer hook has a web service DeploymentAspectManager injected into it. - A web service DeploymentAspectManager maintains a list of DeploymentAspects, each of which - handles a single aspect of web service deployment. + <bean name="JSEHttpTransport" class="org.jboss.wsf.container.jboss50.transport.NoopHttpTransportManager"/> - Finally, each Endpoint is registered with the EndpointRegistry. + <bean name="EJBHttpTransport" class="org.jboss.wsf.container.jboss50.transport.EJBHttpTransportManager"> + <property name="generator"><inject bean="WSWebAppGenerator"/></property> + <property name="deploymentFactory"><inject bean="WSWebAppDeploymentFactory"/></property> + </bean> - ********************************************************************************************************************* - --> + <bean name="EndpointAPIHttpTransport" class="org.jboss.wsf.container.jboss50.transport.EndpointAPIHttpTransportManager"> + <property name="generator"><inject bean="WSWebAppGenerator"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> + </bean> -  - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"> - <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> - <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property> - <depends>EJB2xDeployer</depends> - <depends>Ejb3Deployer</depends> +  + <bean name="WSWebAppGenerator" class="org.jboss.wsf.container.jboss50.transport.WebAppGenerator"> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> -  - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> +  + <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory"> + <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> </bean> + +  + <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/>  - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> + + <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE</property> </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> +  -  - <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE"> - <property name="runtimeName">WebserviceJSERuntime</property> - <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPreJSE</depends> + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> </bean> -  - <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPostJSE"> - <property name="runtimeName">WebserviceJSERuntime</property> - <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPostJSE</depends> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> </bean> + + <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.framework.deployment.HttpTransportDeploymentAspect"> + <property name="requires">URLPattern,ContextProperties</property> + <property name="provides">EndpointAddress</property> + </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookEJB21"> - <property name="runtimeName">WebserviceEJBRuntime</property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> </bean> -  - <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE"> - <property name="runtimeName">WebserviceJSERuntime</property> - <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPreJSE</depends> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> </bean> -  - <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPostJSE"> - <property name="runtimeName">WebserviceJSERuntime</property> - <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPostJSE</depends> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookEJB3"> - <property name="runtimeName">WebserviceEJBRuntime</property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> </bean> + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + <depends>WSEndpointRegistry</depends> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, StackDescriptor</property> + <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + +  + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/> + <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/> + +  + + <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + +  + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + +  + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + </set> + </property> + </bean> + </deployment>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7090 - framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 06:00:43 -0400 (Mon, 19 May 2008) New Revision: 7090 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: Fixing ProjectGeneratorTestCase regression Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-05-19 09:45:18 UTC (rev 7089) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-05-19 10:00:43 UTC (rev 7090) @@ -36,6 +36,7 @@ import javax.xml.ws.Service; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; /** * A test case for the user project generator: @@ -75,9 +76,9 @@ } File userPrjProp = new File(binDistroDir, "user-project.properties"); writeUserProjectProperties(userPrjProp); - File distroBuild = new File(binDistroDir, "build.sh"); + File distroBuild = new File(binDistroDir, "build.xml"); String integrationTarget = System.getProperty("jbossws.integration.target"); - assertStatusCode(executeCommand(distroBuild.getCanonicalPath() + " -D" + integrationTarget + ".home=" + jbossHome + " -Djbossws.integration.target=" + assertStatusCode(executeCommand("ant -f " + distroBuild.getAbsolutePath() + " -D" + integrationTarget + ".home=" + jbossHome + " -Djbossws.integration.target=" + integrationTarget + " create-project"), "Error while creating the user project!"); File projectHomeDir = new File(workspaceHome, projectName); File packageDir = new File(projectHomeDir.getCanonicalPath() + "/src/main/java/org/jboss/test/ws/projectGenerator"); @@ -103,7 +104,7 @@ finally { assertStatusCode(executeCommand("ant -f " + projectBuild + " undeploy"), "Error while undeploying the user project"); - assertStatusCode(executeCommand(distroBuild.getCanonicalPath() + " delete-project"), "Error while deleting the user project"); + assertStatusCode(executeCommand("ant -f " + distroBuild.getCanonicalPath() + " delete-project"), "Error while deleting the user project"); userPrjProp.delete(); } } @@ -195,14 +196,15 @@ private boolean isDistroTest() throws Exception { - File build = new File("../build.sh"); + File build = new File("../build.xml"); if (!build.exists()) { - build = new File("../../build.sh"); + String testResDir = JBossWSTestHelper.getTestResourcesDir(); + build = new File(testResDir.substring(0, testResDir.lastIndexOf("modules")) + "build.xml"); } if (!build.exists()) - throw new Exception("Unable to find build.sh!"); - Process p = executeCommand(build.getCanonicalPath() + " -p"); + throw new Exception("Unable to find build.xml!"); + Process p = executeCommand("ant -f " + build.getAbsolutePath() + " -p"); p.waitFor(); BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream())); String line;

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7089 - stack/native/trunk/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 05:45:18 -0400 (Mon, 19 May 2008) New Revision: 7089 Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml Log: Copying projectGenerator and console test cases in binary distro Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 08:56:45 UTC (rev 7088) +++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 09:45:18 UTC (rev 7089) @@ -84,8 +84,12 @@ <unpackOptions> <includes> <include>ant-import/**</include> + <include>java/org/jboss/test/ws/console/**</include> <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>java/org/jboss/test/ws/projectGenerator/**</include> + <include>resources/console/**</include> <include>resources/jaxws/samples/**</include> + <include>resources/projectGenerator/**</include> </includes> </unpackOptions> </dependencySet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7088 - in stack/native/trunk/src/main: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 04:56:45 -0400 (Mon, 19 May 2008) New Revision: 7088 Added: stack/native/trunk/src/main/distro/build-project-gen.xml Removed: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml Modified: stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-bin-dist.xml Log: Restoring project generator Deleted: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-project-gen.xml 2008-05-19 07:47:22 UTC (rev 7087) +++ stack/native/trunk/src/main/distro/bin-dist-project-gen.xml 2008-05-19 08:56:45 UTC (rev 7088) @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <target name="init-project-properties" depends="tests-classpath"> - <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/> - <property file="./user-project.properties" /> - <property name="project.home" value="${workspace.home}/${project.name}"/> - - <filterset id="project"> - <filter token="projectName" value="${project.name}" /> - <filter token="jbossHome" value="${project.jboss.home}" /> - </filterset> - - <path id="jbws-ant.path"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> - </path> - <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> - <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> - <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> - <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> - </target> - - <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> - <property file="./user-project.properties" prefix="old" /> - - <echo message="-------------------------------------------------"/> - <echo message=" Welcome to the JBossWS user project generator"/> - <echo message="-------------------------------------------------"/> - <echo message=""/> - - <property name="old.workspace.home" value="C:/Projects"/> - <input addproperty="workspace.home.new" - message="Enter your Java project workspace (the directory that contains your projects) " - defaultvalue="${old.workspace.home}"/> - <pathFixer property="workspace.home.new" /> - - <property name="old.project.name" value="myproject"/> - <input addproperty="project.name.new" - message="Enter the project name " - defaultvalue="${old.project.name}"/> - - <property name="old.project.type" value="jar"/> - <input addproperty="project.type.new" - message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) " - validargs="jar,war" - defaultvalue="${old.project.type}"/> - - <delete file="user-project.properties"/> - <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup"> - <entry key="workspace.home" value="${workspace.home.new}"/> - <entry key="project.name" value="${project.name.new}"/> - <entry key="project.type" value="${project.type.new}"/> - <entry key="project.jboss.home" value="${jboss.home}"/> - <entry key="project.jboss.conf" value="${jboss.server.instance}"/> - </propertyfile> - - <echo message=""/> - <echo message="Your project settings have been saved in file 'user-project.properties'."/> - <echo message="Please type 'ant create-project' to create the new project."/> - </target> - - <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project"> - <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/> - <echo message="It includes a simple Ant build file and references the required libraries."/> - <echo message="Please refer to http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS for the authoritative documentation."/> - <echo message=""/> - <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/> - <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/> - <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/> - </target> - - <target name="validate-settings" depends="init-project-properties"> - <fail message="No project name specified (run 'ant setup-new-project' first)"> - <condition> - <or> - <not><isset property="project.name"/></not> - <equals arg1="${project.name}" arg2=""/> - </or> - </condition> - </fail> - <fail message="No project workspace specified (run 'ant setup-new-project' first)"> - <condition> - <or> - <not><isset property="workspace.home"/></not> - <equals arg1="${workspace.home}" arg2=""/> - </or> - </condition> - </fail> - </target> - - <target name="configure-project"> - <mkdir dir="${project.home}/src/main/java"/> - <mkdir dir="${project.home}/src/main/resources"/> - <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> - <filterset refid="project"/> - </copy> - <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> - <path id="project.classpath"> - <path refid="integration.target.javac.classpath" /> - <pathelement location="${jboss.client}/jbossws-common.jar"/> - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/> - <pathelement location="${jboss.client}/jboss-jaxws.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-client.jar"/> - </path> - <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> - <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> - <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> - </target> - - <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> - <echo message="Deleting the entire project in ${project.home}" /> - <delete dir="${project.home}" /> - </target> - - <target name="settings" depends="init-project-properties" description="Print the current project settings"> - <echo message="Java project workspace: ${workspace.home}"/> - <echo message="JBoss home: ${project.jboss.home}"/> - <echo message="JBoss conf: ${project.jboss.conf}"/> - <echo message="Project name: ${project.name}"/> - <echo message="Project type: ${project.type}"/> - </target> - -</project> \ No newline at end of file Copied: stack/native/trunk/src/main/distro/build-project-gen.xml (from rev 7053, stack/native/trunk/src/main/distro/bin-dist-project-gen.xml) =================================================================== --- stack/native/trunk/src/main/distro/build-project-gen.xml (rev 0) +++ stack/native/trunk/src/main/distro/build-project-gen.xml 2008-05-19 08:56:45 UTC (rev 7088) @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="init-project-properties" depends="tests-init"> + <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/> + <property file="./user-project.properties" /> + <property name="project.home" value="${workspace.home}/${project.name}"/> + + <filterset id="project"> + <filter token="projectName" value="${project.name}" /> + <filter token="jbossHome" value="${project.jboss.home}" /> + </filterset> + + <path id="jbws-ant.path"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + </path> + <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> + <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> + </target> + + <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> + <property file="./user-project.properties" prefix="old" /> + + <echo message="-------------------------------------------------"/> + <echo message=" Welcome to the JBossWS user project generator"/> + <echo message="-------------------------------------------------"/> + <echo message=""/> + + <property name="old.workspace.home" value="C:/Projects"/> + <input addproperty="workspace.home.new" + message="Enter your Java project workspace (the directory that contains your projects) " + defaultvalue="${old.workspace.home}"/> + <pathFixer property="workspace.home.new" /> + + <property name="old.project.name" value="myproject"/> + <input addproperty="project.name.new" + message="Enter the project name " + defaultvalue="${old.project.name}"/> + + <property name="old.project.type" value="jar"/> + <input addproperty="project.type.new" + message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) " + validargs="jar,war" + defaultvalue="${old.project.type}"/> + + <delete file="user-project.properties"/> + <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup"> + <entry key="workspace.home" value="${workspace.home.new}"/> + <entry key="project.name" value="${project.name.new}"/> + <entry key="project.type" value="${project.type.new}"/> + <entry key="project.jboss.home" value="${jboss.home}"/> + <entry key="project.jboss.conf" value="${jboss.server.instance}"/> + </propertyfile> + + <echo message=""/> + <echo message="Your project settings have been saved in file 'user-project.properties'."/> + <echo message="Please type 'ant create-project' to create the new project."/> + </target> + + <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project"> + <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/> + <echo message="It includes a simple Ant build file and references the required libraries."/> + <echo message="Please refer to http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS for the authoritative documentation."/> + <echo message=""/> + <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/> + <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/> + <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/> + </target> + + <target name="validate-settings" depends="init-project-properties"> + <fail message="No project name specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="project.name"/></not> + <equals arg1="${project.name}" arg2=""/> + </or> + </condition> + </fail> + <fail message="No project workspace specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="workspace.home"/></not> + <equals arg1="${workspace.home}" arg2=""/> + </or> + </condition> + </fail> + </target> + + <target name="configure-project"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> + <pathelement location="${jboss.client}/jbossws-common.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxrpc.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxws.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxws-ext.jar"/> + <pathelement location="${jboss.client}/jbossws-native-saaj.jar"/> + <pathelement location="${jboss.client}/jbossws-native-core.jar"/> + <pathelement location="${jboss.client}/jbossws-native-client.jar"/> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> + <echo message="Deleting the entire project in ${project.home}" /> + <delete dir="${project.home}" /> + </target> + + <target name="settings" depends="init-project-properties" description="Print the current project settings"> + <echo message="Java project workspace: ${workspace.home}"/> + <echo message="JBoss home: ${project.jboss.home}"/> + <echo message="JBoss conf: ${project.jboss.conf}"/> + <echo message="Project name: ${project.name}"/> + <echo message="Project type: ${project.type}"/> + </target> + +</project> \ No newline at end of file Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-05-19 07:47:22 UTC (rev 7087) +++ stack/native/trunk/src/main/distro/build.xml 2008-05-19 08:56:45 UTC (rev 7088) @@ -37,6 +37,7 @@ <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> + <import file="${build.dir}/build-project-gen.xml"/>   Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 07:47:22 UTC (rev 7087) +++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 08:56:45 UTC (rev 7088) @@ -33,6 +33,8 @@ <include>build-setup.xml</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> + <include>build-project-gen.xml</include> + <include>user-project-build.xml</include> </includes> </fileSet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7087 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 03:47:22 -0400 (Mon, 19 May 2008) New Revision: 7087 Modified: stack/native/trunk/src/main/distro/build.xml Log: Typo Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-05-19 07:40:36 UTC (rev 7086) +++ stack/native/trunk/src/main/distro/build.xml 2008-05-19 07:47:22 UTC (rev 7087) @@ -11,7 +11,7 @@  -<project basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-Native">

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7086 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 03:40:36 -0400 (Mon, 19 May 2008) New Revision: 7086 Modified: stack/native/trunk/src/main/distro/build-deploy.xml Log: Typo Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-19 07:39:59 UTC (rev 7085) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-19 07:40:36 UTC (rev 7086) @@ -72,7 +72,7 @@ </target>  -  +   <target name="deploy-structure-jboss50" depends="prepare-deploy">

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7085 - in stack/native/trunk/modules: client/etc and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 03:39:59 -0400 (Mon, 19 May 2008) New Revision: 7085 Added: stack/native/trunk/modules/client/etc/ stack/native/trunk/modules/client/etc/default.mf Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java Log: Fixing JBWS1666TestCase regression (adding default manifest for jbossws-native-client.jar) Added: stack/native/trunk/modules/client/etc/default.mf =================================================================== --- stack/native/trunk/modules/client/etc/default.mf (rev 0) +++ stack/native/trunk/modules/client/etc/default.mf 2008-05-19 07:39:59 UTC (rev 7085) @@ -0,0 +1,10 @@ +Specification-Title: JBossWS +Specification-Vendor: JBoss (http://www.jboss.org) +Implementation-Title: JBoss Web Services - Stack Native Client +Implementation-URL: http://www.jboss.org/products/jbossws +Implementation-Vendor: JBoss, a division of Red Hat +Implementation-Vendor-Id: http://www.jboss.org +Class-Path: jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar + jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar + activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar + mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2008-05-16 23:40:34 UTC (rev 7084) +++ stack/native/trunk/modules/client/pom.xml 2008-05-19 07:39:59 UTC (rev 7085) @@ -37,5 +37,18 @@ <artifactId>jboss-logging-log4j</artifactId> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>etc/default.mf</manifestFile> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-05-16 23:40:34 UTC (rev 7084) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-05-19 07:39:59 UTC (rev 7085) @@ -29,6 +29,7 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.wsf.common.IOUtils; @@ -64,8 +65,8 @@ // Setup the classpath - do not modify this lightheartedly. // Maybe you should extend the Class-Path in the MANIFEST instead. - StringBuffer cp = new StringBuffer("./test-classes"); - cp.append(":" + jbc + "/jbossws-client.jar"); + StringBuffer cp = new StringBuffer(System.getProperty("test.classes.directory")); + cp.append(":" + jbc + "/jbossws-native-client.jar"); if (isTargetJBoss50()) { cp.append(":" + jbc + "/jboss-common-core.jar");

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7084 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.jar/META-INF/services.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-16 19:40:34 -0400 (Fri, 16 May 2008) New Revision: 7084 Added: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator Log: adding WSFRuntimeLocator service file Added: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator 2008-05-16 23:40:34 UTC (rev 7084) @@ -0,0 +1 @@ +org.jboss.wsf.framework.DefaultWSFRuntimeLocator \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r7083 - container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-16 19:34:05 -0400 (Fri, 16 May 2008) New Revision: 7083 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java Log: final optimization - java code completely backported ;) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-16 23:30:27 UTC (rev 7082) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-16 23:34:05 UTC (rev 7083) @@ -52,12 +52,13 @@ public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) { - assert deploymentFactory!=null; - assert generator!=null; + assert deploymentFactory != null; + assert generator != null; // Resolve the endpoint address if(! (transportSpec instanceof HttpSpec)) throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec); + HttpSpec httpSpec = (HttpSpec)transportSpec; // Create JBossWebMetaData and attach it to the DeploymentUnit Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-16 23:30:27 UTC (rev 7082) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-16 23:34:05 UTC (rev 7083) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.container.jboss50.transport; -import org.jboss.logging.Logger; import org.jboss.wsf.framework.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -44,10 +43,7 @@ */ public class EndpointAPIHttpTransportManager implements TransportManager { - private static Logger log = Logger.getLogger(EndpointAPIHttpTransportManager.class); - private WebAppGenerator generator; - private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>(); public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) @@ -77,7 +73,6 @@ String ctx = httpSpec.getWebContext(); String pattern = httpSpec.getUrlPattern(); listenerRef = new HttpListenerRef( ctx, pattern, new URI("http://"+hostAndPort+ctx+pattern) ); - } catch (URISyntaxException e) { @@ -103,5 +98,4 @@ { this.generator = generator; } - }

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r7082 - container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-16 19:30:27 -0400 (Fri, 16 May 2008) New Revision: 7082 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java Log: don't forget to destroy deployment factory Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-16 23:22:56 UTC (rev 7081) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-16 23:30:27 UTC (rev 7082) @@ -36,6 +36,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.HashMap; +import java.util.Map; /** * Creates a webapp dpeloyment and pushes it into the deployment framework @@ -46,10 +48,10 @@ { private WebAppDeploymentFactory deploymentFactory; private WebAppGenerator generator; - + private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>(); + public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) { - assert deploymentFactory!=null; assert generator!=null; @@ -75,27 +77,38 @@ int port = serverConfig.getWebServicePort(); String hostAndPort = host + (port > 0 ? ":" + port : ""); + ListenerRef listenerRef = null; try { String ctx = httpSpec.getWebContext(); String pattern = httpSpec.getUrlPattern(); - ListenerRef ref = new HttpListenerRef( - ctx, pattern, - new URI("http://"+hostAndPort+ctx+pattern) - ); - - return ref; - - } catch (URISyntaxException e) + listenerRef = new HttpListenerRef( ctx, pattern, new URI("http://"+hostAndPort+ctx+pattern) ); + } + catch (URISyntaxException e) { throw new RuntimeException("Failed to create ListenerRef", e); } - + + // Map listenerRef for destroy phase + deploymentRegistry.put( listenerRef.getUUID(), topLevelDeployment ); + + return listenerRef; } public void destroyListener(ListenerRef ref) { - // noop + Deployment dep = deploymentRegistry.get(ref.getUUID()); + if(null==dep) + throw new IllegalArgumentException("Unknown ListenerRef " + ref); + + try + { + deploymentFactory.destroy(dep); + } + finally + { + deploymentRegistry.remove(ref.getUUID()); + } } public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-16 23:22:56 UTC (rev 7081) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-16 23:30:27 UTC (rev 7082) @@ -88,7 +88,6 @@ deploymentRegistry.put( listenerRef.getUUID(), topLevelDeployment ); return listenerRef; - } public void destroyListener(ListenerRef ref)

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008