[jbossws-commits] JBossWS SVN: r7589 - in container: jboss500 and 27 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-06-16 05:26:56 -0400 (Mon, 16 Jun 2008) New Revision: 7589 Added: container/jboss500/ container/jboss500/branches/ container/jboss500/branches/jbossws-jboss500-3.0.2/ container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath container/jboss500/branches/jbossws-jboss500-3.0.2/.project container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml Removed: container/jboss500/branches/ container/jboss500/branches/jbossws-jboss500-3.0.2/ container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath container/jboss500/branches/jbossws-jboss500-3.0.2/.project container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml Modified: container/jboss501/branches/jbossws-jboss501-3.0.2/pom.xml Log: Restore jboss500/branches/jbossws-jboss500-3.0.2 Copied: container/jboss500 (from rev 7556, container/jboss500) Copied: container/jboss500/branches (from rev 7556, container/jboss500/branches) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2 (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2) Property changes on: container/jboss500/branches/jbossws-jboss500-3.0.2 ___________________________________________________________________ Name: svn:ignore + .settings target Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/eclipse-classes"/> -</classpath> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/.classpath 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/eclipse-classes"/> +</classpath> Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/.project =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/.project 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/.project 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbossws-jboss500</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/.project (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/.project) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/.project (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/.project 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jbossws-jboss500</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,7 +0,0 @@ -This is a copy of the jbossws-jboss501 integration. To finish this you need to - -#1 update the sources -#2 change the dependencies to 5.0.0.Bata4 have a look at jbossws-jboss422 on hos to do this -#3 deploy to the repos - -good luck \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/README.txt 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,7 @@ +This is a copy of the jbossws-jboss501 integration. To finish this you need to + +#1 update the sources +#2 change the dependencies to 5.0.0.Bata4 have a look at jbossws-jboss422 on hos to do this +#3 deploy to the repos + +good luck \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,198 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBoss Web Services - Container JBoss-5.0.0</name> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - - <version>3.0.2-SNAPSHOT</version> - - <!-- Parent --> - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-parent</artifactId> - <version>1.0.0.GA</version> - </parent> - - <!-- Source Control Management --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jb... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/contai... - <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branche... - </scm> - - <!-- Properties --> - <properties> - <jbossws.common.version>1.0.5-SNAPSHOT</jbossws.common.version> - <jbossws.spi.version>1.0.4-SNAPSHOT</jbossws.spi.version> - <jboss.version>5.0.0.Beta4</jboss.version> - - <jboss.ejb3.version>0.1.2.Beta1</jboss.ejb3.version> - <jboss.security.version>2.0.2.Beta4</jboss.security.version> - <jboss.vfs.version>2.0.0.Beta9</jboss.vfs.version> - <jboss.jbossxb.version>2.0.0.CR5</jboss.jbossxb.version> - <jboss.microcontainer.version>2.0.0.Beta10</jboss.microcontainer.version> - </properties> - - <!-- DependencyManagement --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws.spi.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws.common.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>${jboss.vfs.version}</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.jbossxb.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.ejb3.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3-ext-API</artifactId> - <version>${jboss.ejb3.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3-core</artifactId> - <version>${jboss.ejb3.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-metadata</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>${jboss.microcontainer.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx-client</artifactId> - <version>${jboss.security.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <!-- Dependencies --> - <dependencies> - - <!-- jbossws dependencies --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <scope>provided</scope> - </dependency> - - <!-- JBoss provided dependencies --> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Transitive compile dependencies --> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3-ext-API</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-metadata</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx-client</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - - <!-- Plugins --> - <build> - <resources> - <resource> - <targetPath>../etc</targetPath> - <directory>src/main/etc</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources/jbossws-jboss50.jar</directory> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/scripts/assembly-container.xml</descriptor> - <descriptor>src/main/scripts/assembly-resources.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/pom.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,198 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Container JBoss-5.0.0</name> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + + <version>3.0.2-SNAPSHOT</version> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0.0.GA</version> + </parent> + + <!-- Source Control Management --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/contai... + <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branche... + </scm> + + <!-- Properties --> + <properties> + <jbossws.common.version>1.0.5-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>1.0.4-SNAPSHOT</jbossws.spi.version> + <jboss.version>5.0.0.Beta4</jboss.version> + + <jboss.ejb3.version>0.1.2.Beta1</jboss.ejb3.version> + <jboss.security.version>2.0.2.Beta4</jboss.security.version> + <jboss.vfs.version>2.0.0.Beta9</jboss.vfs.version> + <jboss.jbossxb.version>2.0.0.CR5</jboss.jbossxb.version> + <jboss.microcontainer.version>2.0.0.Beta10</jboss.microcontainer.version> + </properties> + + <!-- DependencyManagement --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>${jboss.vfs.version}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jboss.jbossxb.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <version>${jboss.ejb3.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-ext-API</artifactId> + <version>${jboss.ejb3.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + <version>${jboss.ejb3.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-metadata</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <version>${jboss.microcontainer.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <version>${jboss.security.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <!-- Dependencies --> + <dependencies> + + <!-- jbossws dependencies --> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JBoss provided dependencies --> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Transitive compile dependencies --> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-ext-API</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-metadata</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources/jbossws-jboss50.jar</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/scripts/assembly-container.xml</descriptor> + <descriptor>src/main/scripts/assembly-resources.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,26 +0,0 @@ -<project name="jboss/jbossws-jboss500"> - - <component id="jboss/jbossws-jboss500" - description="JBossWS container integration layer" - version="${version}" - licenseType="lgpl"> - - <artifact id="jbossws-jboss500.jar"/> - <artifact id="jbossws-jboss500-container.jar"/> - <artifact id="jbossws-jboss500-resources.zip"/> - <artifact id="jbossws-jboss500-src.jar"/> - - <import componentref="jboss/jbossws-common"> - <compatible version="${jbossws.common.version}"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="${jbossws.spi.version}"/> - </import> - - <export> - <include input="jbossws-jboss500.jar"/> - </export> - - </component> - -</project> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/etc/component-info.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,26 @@ +<project name="jboss/jbossws-jboss500"> + + <component id="jboss/jbossws-jboss500" + description="JBossWS container integration layer" + version="${version}" + licenseType="lgpl"> + + <artifact id="jbossws-jboss500.jar"/> + <artifact id="jbossws-jboss500-container.jar"/> + <artifact id="jbossws-jboss500-resources.zip"/> + <artifact id="jbossws-jboss500-src.jar"/> + + <import componentref="jboss/jbossws-common"> + <compatible version="${jbossws.common.version}"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="${jbossws.spi.version}"/> + </import> + + <export> + <include input="jbossws-jboss500.jar"/> + </export> + + </component> + +</project> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50 (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,167 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.logging.Logger; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspectManager; -import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.transport.TransportManagerFactory; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class BareWSFRuntime implements WSFRuntime -{ - private static final Logger log = Logger.getLogger(BareWSFRuntime.class); - - private String runtimeName; - - private DeploymentAspectManager deploymentManager; - - private EndpointRegistry endpointRegistry; - - private RequestHandlerFactory requestHandlerFactory; - - private InvocationHandlerFactory invocationHandlerFactory; - - private TransportManagerFactory transportManagerFactory; - - boolean initialized; - - public BareWSFRuntime(String runtimeName) - { - this.runtimeName = runtimeName; - } - - // --------------------------------------------------------------------------------- - - public void create(Deployment deployment) - { - init(); - deploymentManager.create(deployment, this); - } - - private void init() - { - if(!initialized) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - setEndpointRegistry( spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry() ); - setRequestHandlerFactory( spiProvider.getSPI(RequestHandlerFactory.class) ); - setInvocationHandlerFactory( spiProvider.getSPI(InvocationHandlerFactory.class) ); - initialized = true; - } - } - - public void start(Deployment deployment) - { - init(); - deploymentManager.start(deployment, this); - } - - public void stop(Deployment deployment) - { - init(); - deploymentManager.stop(deployment, this); - } - - public void destroy(Deployment deployment) - { - init(); - deploymentManager.destroy(deployment, this); - } - - // --------------------------------------------------------------------------------- - - public void setTransportManagerFactory(TransportManagerFactory factory) - { - assert factory!=null; - log.debug(runtimeName + " -> TransportManagerFactory: " + factory); - this.transportManagerFactory = factory; - } - - public TransportManagerFactory getTransportManagerFactory() - { - return this.transportManagerFactory; - } - - public void setEndpointRegistry(EndpointRegistry endpointRegistry) - { - assert endpointRegistry!=null; - log.debug(runtimeName + " -> EndpointRegistry: " + endpointRegistry); - this.endpointRegistry = endpointRegistry; - } - - public EndpointRegistry getEndpointRegistry() - { - return this.endpointRegistry; - } - - public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) - { - assert deploymentManager!=null; - log.debug(runtimeName + " -> DeploymentAspectManager: " + deploymentManager); - this.deploymentManager = deploymentManager; - } - - public DeploymentAspectManager getDeploymentAspectManager() - { - return this.deploymentManager; - } - - public void setRequestHandlerFactory(RequestHandlerFactory factory) - { - assert factory!=null; - log.debug(runtimeName + " -> RequestHandlerFactory: "+ factory); - this.requestHandlerFactory = factory; - } - - - public RequestHandlerFactory getRequestHandlerFactory() - { - return this.requestHandlerFactory; - } - - public void setInvocationHandlerFactory(InvocationHandlerFactory factory) - { - assert factory!=null; - log.debug(runtimeName + " -> InvocationHandlerFactory: "+ factory); - this.invocationHandlerFactory = factory; - } - - public InvocationHandlerFactory getInvocationHandlerFactory() - { - return this.invocationHandlerFactory; - } - - public String toString() - { - return this.runtimeName+ ": " + super.toString(); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.logging.Logger; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.transport.TransportManagerFactory; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class BareWSFRuntime implements WSFRuntime +{ + private static final Logger log = Logger.getLogger(BareWSFRuntime.class); + + private String runtimeName; + + private DeploymentAspectManager deploymentManager; + + private EndpointRegistry endpointRegistry; + + private RequestHandlerFactory requestHandlerFactory; + + private InvocationHandlerFactory invocationHandlerFactory; + + private TransportManagerFactory transportManagerFactory; + + boolean initialized; + + public BareWSFRuntime(String runtimeName) + { + this.runtimeName = runtimeName; + } + + // --------------------------------------------------------------------------------- + + public void create(Deployment deployment) + { + init(); + deploymentManager.create(deployment, this); + } + + private void init() + { + if(!initialized) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + setEndpointRegistry( spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry() ); + setRequestHandlerFactory( spiProvider.getSPI(RequestHandlerFactory.class) ); + setInvocationHandlerFactory( spiProvider.getSPI(InvocationHandlerFactory.class) ); + initialized = true; + } + } + + public void start(Deployment deployment) + { + init(); + deploymentManager.start(deployment, this); + } + + public void stop(Deployment deployment) + { + init(); + deploymentManager.stop(deployment, this); + } + + public void destroy(Deployment deployment) + { + init(); + deploymentManager.destroy(deployment, this); + } + + // --------------------------------------------------------------------------------- + + public void setTransportManagerFactory(TransportManagerFactory factory) + { + assert factory!=null; + log.debug(runtimeName + " -> TransportManagerFactory: " + factory); + this.transportManagerFactory = factory; + } + + public TransportManagerFactory getTransportManagerFactory() + { + return this.transportManagerFactory; + } + + public void setEndpointRegistry(EndpointRegistry endpointRegistry) + { + assert endpointRegistry!=null; + log.debug(runtimeName + " -> EndpointRegistry: " + endpointRegistry); + this.endpointRegistry = endpointRegistry; + } + + public EndpointRegistry getEndpointRegistry() + { + return this.endpointRegistry; + } + + public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) + { + assert deploymentManager!=null; + log.debug(runtimeName + " -> DeploymentAspectManager: " + deploymentManager); + this.deploymentManager = deploymentManager; + } + + public DeploymentAspectManager getDeploymentAspectManager() + { + return this.deploymentManager; + } + + public void setRequestHandlerFactory(RequestHandlerFactory factory) + { + assert factory!=null; + log.debug(runtimeName + " -> RequestHandlerFactory: "+ factory); + this.requestHandlerFactory = factory; + } + + + public RequestHandlerFactory getRequestHandlerFactory() + { + return this.requestHandlerFactory; + } + + public void setInvocationHandlerFactory(InvocationHandlerFactory factory) + { + assert factory!=null; + log.debug(runtimeName + " -> InvocationHandlerFactory: "+ factory); + this.invocationHandlerFactory = factory; + } + + public InvocationHandlerFactory getInvocationHandlerFactory() + { + return this.invocationHandlerFactory; + } + + public String toString() + { + return this.runtimeName+ ": " + super.toString(); + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,128 +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.container.jboss50.deployer; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.WSFRuntimeLocator; -import org.jboss.wsf.spi.deployment.*; - -//$Id$ - - -/** - * An abstract web service deployer. - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.com - * - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHook implements DeployerHook -{ - // provide logging - protected final Logger log = Logger.getLogger(getClass()); - - protected String runtimeName; - private WSFRuntime wsfRuntime; - - private DeploymentModelFactory deploymentModelFactory; - - public WSFRuntime getWsfRuntime() - { - if(null == wsfRuntime) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - wsfRuntime = spiProvider.getSPI(WSFRuntimeLocator.class).locateRuntime(runtimeName); - } - - return wsfRuntime; - } - - public void setWsfRuntime(WSFRuntime wsfRuntime) - { - this.wsfRuntime = wsfRuntime; - } - - public void setRuntimeName(String runtimeName) - { - this.runtimeName = runtimeName; - } - - public DeploymentModelFactory getDeploymentModelFactory() - { - if(null == deploymentModelFactory) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - } - - return deploymentModelFactory; - } - - public ArchiveDeployment newDeployment(DeploymentUnit unit) - { - try - { - DeploymentModelFactory factory = getDeploymentModelFactory(); - ArchiveDeployment dep = (ArchiveDeployment)factory.newDeployment(unit.getSimpleName(), unit.getClassLoader()); - if (unit.getParent() != null) - { - DeploymentUnit parentUnit = unit.getParent(); - ArchiveDeployment parentDep = (ArchiveDeployment)factory.newDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader()); - dep.setParent(parentDep); - } - return dep; - } - catch (Exception ex) - { - throw new WSFDeploymentException("Cannot load spi.deployment.Deployment class", ex); - } - } - - public Endpoint newEndpoint(String targetBean) - { - try - { - return getDeploymentModelFactory().newEndpoint(targetBean); - } - catch (Exception ex) - { - throw new WSFDeploymentException("Cannot load spi.deployment.Endpoint class", ex); - } - } - - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentUnit unit) - { - String name = unit.getName(); - return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); - } - - /** Get the deployment type this deployer can handle - */ - public abstract Deployment.DeploymentType getDeploymentType(); -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,128 @@ +/* + * 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.deployer; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.WSFRuntimeLocator; +import org.jboss.wsf.spi.deployment.*; + +//$Id$ + + +/** + * An abstract web service deployer. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com + * + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHook implements DeployerHook +{ + // provide logging + protected final Logger log = Logger.getLogger(getClass()); + + protected String runtimeName; + private WSFRuntime wsfRuntime; + + private DeploymentModelFactory deploymentModelFactory; + + public WSFRuntime getWsfRuntime() + { + if(null == wsfRuntime) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + wsfRuntime = spiProvider.getSPI(WSFRuntimeLocator.class).locateRuntime(runtimeName); + } + + return wsfRuntime; + } + + public void setWsfRuntime(WSFRuntime wsfRuntime) + { + this.wsfRuntime = wsfRuntime; + } + + public void setRuntimeName(String runtimeName) + { + this.runtimeName = runtimeName; + } + + public DeploymentModelFactory getDeploymentModelFactory() + { + if(null == deploymentModelFactory) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } + + return deploymentModelFactory; + } + + public ArchiveDeployment newDeployment(DeploymentUnit unit) + { + try + { + DeploymentModelFactory factory = getDeploymentModelFactory(); + ArchiveDeployment dep = (ArchiveDeployment)factory.newDeployment(unit.getSimpleName(), unit.getClassLoader()); + if (unit.getParent() != null) + { + DeploymentUnit parentUnit = unit.getParent(); + ArchiveDeployment parentDep = (ArchiveDeployment)factory.newDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader()); + dep.setParent(parentDep); + } + return dep; + } + catch (Exception ex) + { + throw new WSFDeploymentException("Cannot load spi.deployment.Deployment class", ex); + } + } + + public Endpoint newEndpoint(String targetBean) + { + try + { + return getDeploymentModelFactory().newEndpoint(targetBean); + } + catch (Exception ex) + { + throw new WSFDeploymentException("Cannot load spi.deployment.Endpoint class", ex); + } + } + + /** Return true if this deployment should be ignored + */ + public boolean ignoreDeployment(DeploymentUnit unit) + { + String name = unit.getName(); + return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); + } + + /** Get the deployment type this deployer can handle + */ + public abstract Deployment.DeploymentType getDeploymentType(); +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.deployer; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.wsf.spi.deployment.Deployment; -import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; - -//$Id$ - -/** - * An abstract deployer for EJB Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook -{ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if(!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - super.deploy(unit); // Calls create - - Deployment dep = unit.getAttachment(Deployment.class); - if(null==dep || DeploymentState.CREATED != dep.getState()) - throw new DeploymentException("Create step failed"); - - // execute the 'start' step - getWsfRuntime().start(dep); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.deployer; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.wsf.spi.deployment.Deployment; +import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; + +//$Id$ + +/** + * An abstract deployer for EJB Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook +{ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if(!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + super.deploy(unit); // Calls create + + Deployment dep = unit.getAttachment(Deployment.class); + if(null==dep || DeploymentState.CREATED != dep.getState()) + throw new DeploymentException("Create step failed"); + + // execute the 'start' step + getWsfRuntime().start(dep); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,67 +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.container.jboss50.deployer; - -//$Id$ - -import java.util.List; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.javaee.spec.ParamValueMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.transport.HttpSpec; - -/** - * An abstract deployer for JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook -{ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); - boolean isGenerated = Boolean.TRUE.equals(unit.getAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP)); - return webMetaData != null && isGenerated == false; - } - - protected String getTargetBean(ServletMetaData servlet) - { - String endpointClass = servlet.getServletClass(); - List<ParamValueMetaData> initParams = servlet.getInitParam(); - if (initParams != null) - { - for (ParamValueMetaData param : initParams) - { - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(param.getParamName())) - { - endpointClass = param.getParamValue(); - break; - } - } - } - return endpointClass; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,67 @@ +/* + * 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.deployer; + +//$Id$ + +import java.util.List; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.javaee.spec.ParamValueMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.transport.HttpSpec; + +/** + * An abstract deployer for JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook +{ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); + boolean isGenerated = Boolean.TRUE.equals(unit.getAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP)); + return webMetaData != null && isGenerated == false; + } + + protected String getTargetBean(ServletMetaData servlet) + { + String endpointClass = servlet.getServletClass(); + List<ParamValueMetaData> initParams = servlet.getInitParam(); + if (initParams != null) + { + for (ParamValueMetaData param : initParams) + { + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(param.getParamName())) + { + endpointClass = param.getParamValue(); + break; + } + } + } + return endpointClass; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,72 +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.container.jboss50.deployer; - -// $Id$ - -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.structure.spi.DeploymentUnit; -import org.jboss.logging.Logger; - -/** - * This deployer that calls the registered DeployerHooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer -{ - // provide logging - private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); - - private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); - - public void addDeployerHook(DeployerHook deployer) - { - log.debug("Add deployer hook: " + deployer); - deployerHooks.add(deployer); - } - - public void removeDeployerHook(DeployerHook deployer) - { - log.debug("Remove deployer hook: " + deployer); - deployerHooks.remove(deployer); - } - - @Override - public void internalDeploy(DeploymentUnit unit) throws DeploymentException - { - for (DeployerHook deployer : deployerHooks) - deployer.deploy(unit); - } - - @Override - public void internalUndeploy(DeploymentUnit unit) - { - for (DeployerHook deployer : deployerHooks) - deployer.undeploy(unit); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,72 @@ +/* + * 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.deployer; + +// $Id$ + +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.structure.spi.DeploymentUnit; +import org.jboss.logging.Logger; + +/** + * This deployer that calls the registered DeployerHooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer +{ + // provide logging + private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); + + private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); + + public void addDeployerHook(DeployerHook deployer) + { + log.debug("Add deployer hook: " + deployer); + deployerHooks.add(deployer); + } + + public void removeDeployerHook(DeployerHook deployer) + { + log.debug("Remove deployer hook: " + deployer); + deployerHooks.remove(deployer); + } + + @Override + public void internalDeploy(DeploymentUnit unit) throws DeploymentException + { + for (DeployerHook deployer : deployerHooks) + deployer.deploy(unit); + } + + @Override + public void internalUndeploy(DeploymentUnit unit) + { + for (DeployerHook deployer : deployerHooks) + deployer.undeploy(unit); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,165 +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.container.jboss50.deployer; - -//$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.metadata.serviceref.VirtualFileAdaptor; -import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; - -/** - * An abstract web service deployer. - * <pre> - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * create(dep) - * start(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * stop(dep) - * destroy(dep) - * </pre> - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.com - * - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - - /** - * Executes the 'create' step only. <br/> - * Subclasses need to take care that the 'start' step is executed as well. - */ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.getName()); - - Deployment dep = getDeployment(unit); - if (dep == null) - { - dep = createDeployment(unit); - dep.addAttachment(DeploymentUnit.class, unit); - } - - if(Deployment.DeploymentState.UNDEFINED == dep.getState()) - { - getWsfRuntime().create(dep); - unit.addAttachment(Deployment.class, dep); - } - else - { - throw new IllegalArgumentException("Cannot process Deployment in state " + dep.getState() + ": " + dep); - } - } - } - - /** - * Executes the stop() and destroy() lifecycles - * @param unit - */ - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.getName()); - getWsfRuntime().stop(dep); - getWsfRuntime().destroy(dep); - } - } - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public abstract boolean isWebServiceDeployment(DeploymentUnit unit); - - /** Create the Deployment for a given DeploymentUnit - */ - public abstract Deployment createDeployment(DeploymentUnit unit); - - /** Get the Deployment for a given DeploymentUnit - */ - public Deployment getDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - - /** Unmrashall the webservices.xml if there is one - */ - protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); - UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); - if (wsMetaData == null && vfWebservices != null) - { - try - { - URL wsURL = vfWebservices.toURL(); - Element root = DOMUtils.parse(wsURL.openStream()); - String namespaceURI = root.getNamespaceURI(); - if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); - unit.addAttachment(WebservicesMetaData.class, wsMetaData); - } - } - catch (Exception ex) - { - throw new WSFDeploymentException(ex); - } - } - return wsMetaData; - } - - private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) - { - VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml"); - return (vf != null ? new VirtualFileAdaptor(vf) : null); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,165 @@ +/* + * 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.deployer; + +//$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.metadata.serviceref.VirtualFileAdaptor; +import org.jboss.virtual.VirtualFile; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; + +/** + * An abstract web service deployer. + * <pre> + * deploy(unit) + * if(isWebServiceDeployment) + * dep = createDeployment(unit) + * create(dep) + * start(dep) + * + * undeploy(unit) + * dep = getDeployment(unit) + * stop(dep) + * destroy(dep) + * </pre> + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com + * + * @since 25-Apr-2007 + */ +public abstract class ArchiveDeployerHook extends AbstractDeployerHook +{ + + /** + * Executes the 'create' step only. <br/> + * Subclasses need to take care that the 'start' step is executed as well. + */ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + log.debug("deploy: " + unit.getName()); + + Deployment dep = getDeployment(unit); + if (dep == null) + { + dep = createDeployment(unit); + dep.addAttachment(DeploymentUnit.class, unit); + } + + if(Deployment.DeploymentState.UNDEFINED == dep.getState()) + { + getWsfRuntime().create(dep); + unit.addAttachment(Deployment.class, dep); + } + else + { + throw new IllegalArgumentException("Cannot process Deployment in state " + dep.getState() + ": " + dep); + } + } + } + + /** + * Executes the stop() and destroy() lifecycles + * @param unit + */ + public void undeploy(DeploymentUnit unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = getDeployment(unit); + if (dep != null) + { + log.debug("undeploy: " + unit.getName()); + getWsfRuntime().stop(dep); + getWsfRuntime().destroy(dep); + } + } + + /** Depending on the type of deployment, this method should return true + * if the deployment contains web service endpoints. + */ + public abstract boolean isWebServiceDeployment(DeploymentUnit unit); + + /** Create the Deployment for a given DeploymentUnit + */ + public abstract Deployment createDeployment(DeploymentUnit unit); + + /** Get the Deployment for a given DeploymentUnit + */ + public Deployment getDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + } + + /** Unmrashall the webservices.xml if there is one + */ + protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); + UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); + if (wsMetaData == null && vfWebservices != null) + { + try + { + URL wsURL = vfWebservices.toURL(); + Element root = DOMUtils.parse(wsURL.openStream()); + String namespaceURI = root.getNamespaceURI(); + if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(wsURL); + wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); + unit.addAttachment(WebservicesMetaData.class, wsMetaData); + } + } + catch (Exception ex) + { + throw new WSFDeploymentException(ex); + } + } + return wsMetaData; + } + + private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) + { + VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml"); + return (vf != null ? new VirtualFileAdaptor(vf) : null); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,40 +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.container.jboss50.deployer; - -//$Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.structure.spi.DeploymentUnit; - -/** - * An interface for all web service deployer hooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public interface DeployerHook -{ - void deploy(DeploymentUnit unit) throws DeploymentException; - - void undeploy(DeploymentUnit unit); -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50.deployer; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.structure.spi.DeploymentUnit; + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentUnit unit) throws DeploymentException; + + void undeploy(DeploymentUnit unit); +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,61 +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.container.jboss50.deployer; - -// $Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * @author Heiko.Braun(a)jboss.com - * @author Thomas.Diesler(a)jboss.com - */ -public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE -{ - /** - * The deployment should be created in phase 1. - */ - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - if (null == dep) - throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1"); - - return dep; - } - - /** - * A phase 2 deployer hook needs to reject first-place - * JSE deployments and wait for those that are re-written. - * We rely on the fact that spi.Deployment is created in phase 1. - */ - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - Deployment deployment = unit.getAttachment(Deployment.class); - return deployment != null; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,61 @@ +/* + * 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.deployer; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * @author Heiko.Braun(a)jboss.com + * @author Thomas.Diesler(a)jboss.com + */ +public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE +{ + /** + * The deployment should be created in phase 1. + */ + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + if (null == dep) + throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1"); + + return dep; + } + + /** + * A phase 2 deployer hook needs to reject first-place + * JSE deployments and wait for those that are re-written. + * We rely on the fact that spi.Deployment is created in phase 1. + */ + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + Deployment deployment = unit.getAttachment(Deployment.class); + return deployment != null; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,106 +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.container.jboss50.deployer; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.serviceref.VirtualFileAdaptor; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -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; - -/** - * A deployer JAXRPC EJB21 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_EJB21; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class); - if (jbmd == null) - throw new IllegalStateException("Deployment unit does not contain application meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - dep.addAttachment(JBossMetaData.class, jbmd); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String ejbLink = pcmd.getEjbLink(); - if (ejbLink == null) - throw new IllegalStateException("ejb-link cannot be null"); - - JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink); - if (beanMetaData == null) - throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); - - String ejbClass = beanMetaData.getEjbClass(); - - // Create the endpoint - Endpoint ep = newEndpoint(ejbClass); - ep.setShortName(ejbLink); - service.addEndpoint(ep); - } - } - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,106 @@ +/* + * 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.deployer; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.serviceref.VirtualFileAdaptor; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +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; + +/** + * A deployer JAXRPC EJB21 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_EJB21; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + ArchiveDeployment dep = newDeployment(unit); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + dep.setRuntimeClassLoader(unit.getClassLoader()); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class); + if (jbmd == null) + throw new IllegalStateException("Deployment unit does not contain application meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(JBossMetaData.class, jbmd); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String ejbLink = pcmd.getEjbLink(); + if (ejbLink == null) + throw new IllegalStateException("ejb-link cannot be null"); + + JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink); + if (beanMetaData == null) + throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); + + String ejbClass = beanMetaData.getEjbClass(); + + // Create the endpoint + Endpoint ep = newEndpoint(ejbClass); + ep.setShortName(ejbLink); + service.addEndpoint(ep); + } + } + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,75 +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.container.jboss50.deployer; - -// $Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE -{ - - /** - * Expects the 'create' step to be executed in - * {@link org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE} - * and executes the 'start' step. - * - */ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - Deployment dep = getDeployment(unit); - if(null==dep || DeploymentState.CREATED != dep.getState()) - throw new DeploymentException("Create step is missing"); - - // execute the 'start' step - getWsfRuntime().start(dep); - } - } - - /** - * Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXRPC_JSE; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return (wsMetaData!=null && super.isWebServiceDeployment(unit)); - } - -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,75 @@ +/* + * 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.deployer; + +// $Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE +{ + + /** + * Expects the 'create' step to be executed in + * {@link org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE} + * and executes the 'start' step. + * + */ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + Deployment dep = getDeployment(unit); + if(null==dep || DeploymentState.CREATED != dep.getState()) + throw new DeploymentException("Create step is missing"); + + // execute the 'start' step + getWsfRuntime().start(dep); + } + } + + /** + * Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } + +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,129 +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.container.jboss50.deployer; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.metadata.serviceref.VirtualFileAdaptor; -import org.jboss.metadata.web.jboss.JBossServletMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -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; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE -{ - - public void undeploy(DeploymentUnit unit) - { - // the JAXRPCDeployerHookPostJSE deals with undeployments - } - - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - dep.addAttachment(JBossWebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - ServletMetaData servlet = getServletForName(webMetaData, servletLink); - String targetBean = getTargetBean(servlet); - - // Create the endpoint - Endpoint ep = newEndpoint(targetBean); - ep.setShortName(servletLink); - service.addEndpoint(ep); - } - } - - return dep; - } - - private ServletMetaData getServletForName(JBossWebMetaData wmd, String servletLink) - { - for (JBossServletMetaData servlet : wmd.getServlets()) - { - if (servletLink.equals(servlet.getName())) - { - return servlet; - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,129 @@ +/* + * 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.deployer; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.metadata.serviceref.VirtualFileAdaptor; +import org.jboss.metadata.web.jboss.JBossServletMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +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; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + + public void undeploy(DeploymentUnit unit) + { + // the JAXRPCDeployerHookPostJSE deals with undeployments + } + + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + ArchiveDeployment dep = newDeployment(unit); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + dep.setRuntimeClassLoader(null); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(JBossWebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + ServletMetaData servlet = getServletForName(webMetaData, servletLink); + String targetBean = getTargetBean(servlet); + + // Create the endpoint + Endpoint ep = newEndpoint(targetBean); + ep.setShortName(servletLink); + service.addEndpoint(ep); + } + } + + return dep; + } + + private ServletMetaData getServletForName(JBossWebMetaData wmd, String servletLink) + { + for (JBossServletMetaData servlet : wmd.getServlets()) + { + if (servletLink.equals(servlet.getName())) + { + return servlet; + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,128 +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.container.jboss50.deployer; - -//$Id$ - -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.mdb.MessagingContainer; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.metadata.serviceref.VirtualFileAdaptor; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; -import java.util.Iterator; - -/** - * A deployer JAXWS EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_EJB3; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); - - // Copy the attachments - dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - String ejbName = container.getEjbName(); - String epBean = container.getBeanClassName(); - - // Create the endpoint - Endpoint ep = newEndpoint(epBean); - ep.setShortName(ejbName); - service.addEndpoint(ep); - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - return false; - - boolean isWebServiceDeployment = false; - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - isWebServiceDeployment = true; - break; - } - } - - return isWebServiceDeployment; - } - - private boolean isWebServiceBean(EJBContainer container) - { - boolean isWebServiceBean = false; - if (container instanceof StatelessContainer || container instanceof MessagingContainer) - { - boolean isWebService = container.resolveAnnotation(WebService.class) != null; - boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; - isWebServiceBean = isWebService || isWebServiceProvider; - } - return isWebServiceBean; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,128 @@ +/* + * 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.deployer; + +//$Id$ + +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.mdb.MessagingContainer; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.metadata.serviceref.VirtualFileAdaptor; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.Iterator; + +/** + * A deployer JAXWS EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_EJB3; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + ArchiveDeployment dep = newDeployment(unit); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + dep.setRuntimeClassLoader(unit.getClassLoader()); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); + + // Copy the attachments + dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + String ejbName = container.getEjbName(); + String epBean = container.getBeanClassName(); + + // Create the endpoint + Endpoint ep = newEndpoint(epBean); + ep.setShortName(ejbName); + service.addEndpoint(ep); + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + return false; + + boolean isWebServiceDeployment = false; + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + isWebServiceDeployment = true; + break; + } + } + + return isWebServiceDeployment; + } + + private boolean isWebServiceBean(EJBContainer container) + { + boolean isWebServiceBean = false; + if (container instanceof StatelessContainer || container instanceof MessagingContainer) + { + boolean isWebService = container.resolveAnnotation(WebService.class) != null; + boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; + isWebServiceBean = isWebService || isWebServiceProvider; + } + return isWebServiceBean; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,76 +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.container.jboss50.deployer; - -// $Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE -{ - - /** - * Expects the 'create' step to be executed in - * {@link org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE} and - * executes the 'start' step. - * - */ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - Deployment dep = getDeployment(unit); - if (null == dep || DeploymentState.CREATED != dep.getState()) - throw new DeploymentException("Create step failed"); - - // execute the 'start' step - getWsfRuntime().start(dep); - } - } - - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXWS_JSE; - } - - /** - * Reject JAX-RPC deployments. - * - * @param unit - * @return - */ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact - return (wsMetaData == null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,76 @@ +/* + * 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.deployer; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE +{ + + /** + * Expects the 'create' step to be executed in + * {@link org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE} and + * executes the 'start' step. + * + */ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + Deployment dep = getDeployment(unit); + if (null == dep || DeploymentState.CREATED != dep.getState()) + throw new DeploymentException("Create step failed"); + + // execute the 'start' step + getWsfRuntime().start(dep); + } + } + + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + /** + * Reject JAX-RPC deployments. + * + * @param unit + * @return + */ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact + return (wsMetaData == null && super.isWebServiceDeployment(unit)); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,142 +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.container.jboss50.deployer; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.metadata.serviceref.VirtualFileAdaptor; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; -import java.util.ArrayList; -import java.util.List; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE -{ - - public void undeploy(DeploymentUnit unit) - { - // the JAXWSDeployerHookPostJSE deals with undeployment - } - - /** Get the deployment type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.addAttachment(JBossWebMetaData.class, webMetaData); - - List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - for (ServletMetaData servlet : servlets) - { - String servletName = servlet.getName(); - String targetBean = getTargetBean(servlet); - - // Create the endpoint - Endpoint ep = newEndpoint(targetBean); - ep.setShortName(servletName); - service.addEndpoint(ep); - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); - List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader) - { - List<ServletMetaData> servlets = new ArrayList<ServletMetaData>(); - for (ServletMetaData servlet : webMetaData.getServlets()) - { - String servletClassName = getTargetBean(servlet); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(servlet); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,142 @@ +/* + * 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.deployer; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.metadata.serviceref.VirtualFileAdaptor; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.ArrayList; +import java.util.List; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + + public void undeploy(DeploymentUnit unit) + { + // the JAXWSDeployerHookPostJSE deals with undeployment + } + + /** Get the deployment type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + ArchiveDeployment dep = newDeployment(unit); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.addAttachment(JBossWebMetaData.class, webMetaData); + + List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + for (ServletMetaData servlet : servlets) + { + String servletName = servlet.getName(); + String targetBean = getTargetBean(servlet); + + // Create the endpoint + Endpoint ep = newEndpoint(targetBean); + ep.setShortName(servletName); + service.addEndpoint(ep); + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class); + List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader) + { + List<ServletMetaData> servlets = new ArrayList<ServletMetaData>(); + for (ServletMetaData servlet : webMetaData.getServlets()) + { + String servletClassName = getTargetBean(servlet); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(servlet); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,54 +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.container.jboss50.deployer; - - -//$Id$ - -/** - * This web service deployer for EJB - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerEJB extends AbstractWebServiceDeployer -{ - private int relOrderEJB2x; - private int relOrderEJB3; - - public void setRelOrderEJB2x(int relOrderEJB2x) - { - this.relOrderEJB2x = relOrderEJB2x; - } - - public void setRelOrderEJB3(int relOrderEJB3) - { - this.relOrderEJB3 = relOrderEJB3; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB2x, relOrderEJB3) + 1; - } - -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,54 @@ +/* + * 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.deployer; + + +//$Id$ + +/** + * This web service deployer for EJB + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerEJB extends AbstractWebServiceDeployer +{ + private int relOrderEJB2x; + private int relOrderEJB3; + + public void setRelOrderEJB2x(int relOrderEJB2x) + { + this.relOrderEJB2x = relOrderEJB2x; + } + + public void setRelOrderEJB3(int relOrderEJB3) + { + this.relOrderEJB3 = relOrderEJB3; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB2x, relOrderEJB3) + 1; + } + +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,45 +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.container.jboss50.deployer; - - -// $Id$ - -/** - * @author Heiko.Braun(a)jboss.com - */ -public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer -{ - private int relOrderWar; - - - public void setRelOrderWar(int relOrder) - { - this.relOrderWar = relOrder; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar + 1; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,45 @@ +/* + * 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.deployer; + + +// $Id$ + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + + public void setRelOrderWar(int relOrder) + { + this.relOrderWar = relOrder; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar + 1; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,47 +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.container.jboss50.deployer; - - -//$Id$ - -/** - * This web service deployer for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer -{ - private int relOrderWar; - - public void setRelOrderWar(int relOrderWar) - { - this.relOrderWar = relOrderWar; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar - 1; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,47 @@ +/* + * 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.deployer; + + +//$Id$ + +/** + * This web service deployer for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + public void setRelOrderWar(int relOrderWar) + { + this.relOrderWar = relOrderWar; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar - 1; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.deployer; - - -//$Id$ - -/** - * The main web service deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceMainDeployer extends AbstractWebServiceDeployer -{ - private int relOrderJSE; - private int relOrderEJB; - - public void setRelOrderEJB(int relOrderEJB) - { - this.relOrderEJB = relOrderEJB; - } - - public void setRelOrderJSE(int relOrderJSE) - { - this.relOrderJSE = relOrderJSE; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB, relOrderJSE) + 1; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.deployer; + + +//$Id$ + +/** + * The main web service deployer + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceMainDeployer extends AbstractWebServiceDeployer +{ + private int relOrderJSE; + private int relOrderEJB; + + public void setRelOrderEJB(int relOrderEJB) + { + this.relOrderEJB = relOrderEJB; + } + + public void setRelOrderJSE(int relOrderJSE) + { + this.relOrderJSE = relOrderJSE; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB, relOrderJSE) + 1; + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,65 +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.container.jboss50.deployment; - -// $Id$ - -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.ejb3.Ejb3Deployment; - -/** - * Determines the correct runtime loader for per deployment type - * and makes it available through the {@link Deployment}. - * - * @author Heiko.Braun(a)jboss.com - */ -public class RuntimeLoaderDeploymentAspect extends DeploymentAspect -{ - public void start(Deployment dep, WSFRuntime runtime) - { - // EJB3 endpoints - if (dep.getAttachment(Ejb3Deployment.class) != null) - { - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - } - // EJB21 endpoints - else if (dep.getAttachment(JBossMetaData.class) != null) - { - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - } - // JSE endpoints - else if (dep.getAttachment(JBossWebMetaData.class) != null) - { - JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); - ClassLoader classLoader = webMetaData.getContextLoader(); - dep.setRuntimeClassLoader(classLoader); - } - else - { - throw new IllegalArgumentException("Unable to determine runtime loader"); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,65 @@ +/* + * 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.deployment; + +// $Id$ + +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.ejb3.Ejb3Deployment; + +/** + * Determines the correct runtime loader for per deployment type + * and makes it available through the {@link Deployment}. + * + * @author Heiko.Braun(a)jboss.com + */ +public class RuntimeLoaderDeploymentAspect extends DeploymentAspect +{ + public void start(Deployment dep, WSFRuntime runtime) + { + // EJB3 endpoints + if (dep.getAttachment(Ejb3Deployment.class) != null) + { + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + } + // EJB21 endpoints + else if (dep.getAttachment(JBossMetaData.class) != null) + { + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + } + // JSE endpoints + else if (dep.getAttachment(JBossWebMetaData.class) != null) + { + JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); + ClassLoader classLoader = webMetaData.getContextLoader(); + dep.setRuntimeClassLoader(classLoader); + } + else + { + throw new IllegalArgumentException("Unable to determine runtime loader"); + } + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,114 +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.container.jboss50.deployment.metadata; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.logging.Logger; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; -import org.jboss.wsf.spi.transport.HttpSpec; - -import java.net.URL; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ContainerMetaDataAdapter -{ - // logging support - private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class); - - private EJBArchiveMetaDataAdapterEJB3 ejbMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3(); - private EJBArchiveMetaDataAdapterEJB21 ejbMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21(); - private JSEArchiveMetaDataAdapter webMetaDataAdapter = new JSEArchiveMetaDataAdapter(); - - public void setEjbMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter) - { - this.ejbMetaDataAdapterEJB21 = adapter; - } - - public void setEjbMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter) - { - this.ejbMetaDataAdapterEJB3 = adapter; - } - - public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter) - { - this.webMetaDataAdapter = adapter; - } - - public void buildContainerMetaData(Deployment dep, DeploymentUnit unit) - { - dep.addAttachment(DeploymentUnit.class, unit); - - try - { - // JSE endpoints - if (unit.getAttachment(JBossWebMetaData.class) != null) - { - JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildMetaData(dep, unit); - if (webMetaData != null) - dep.addAttachment(JSEArchiveMetaData.class, webMetaData); - - if (dep instanceof ArchiveDeployment) - { - URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); - dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webURL); - } - } - - // EJB3 endpoints - else if (unit.getAttachment(Ejb3Deployment.class) != null) - { - EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit); - if (ejbMetaData != null) - dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); - } - - // EJB21 endpoints - else if (unit.getAttachment(JBossMetaData.class) != null) - { - EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB21.buildMetaData(dep, unit); - if (ejbMetaData != null) - dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,114 @@ +/* + * 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.deployment.metadata; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.logging.Logger; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.transport.HttpSpec; + +import java.net.URL; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ContainerMetaDataAdapter +{ + // logging support + private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class); + + private EJBArchiveMetaDataAdapterEJB3 ejbMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3(); + private EJBArchiveMetaDataAdapterEJB21 ejbMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21(); + private JSEArchiveMetaDataAdapter webMetaDataAdapter = new JSEArchiveMetaDataAdapter(); + + public void setEjbMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter) + { + this.ejbMetaDataAdapterEJB21 = adapter; + } + + public void setEjbMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter) + { + this.ejbMetaDataAdapterEJB3 = adapter; + } + + public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter) + { + this.webMetaDataAdapter = adapter; + } + + public void buildContainerMetaData(Deployment dep, DeploymentUnit unit) + { + dep.addAttachment(DeploymentUnit.class, unit); + + try + { + // JSE endpoints + if (unit.getAttachment(JBossWebMetaData.class) != null) + { + JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildMetaData(dep, unit); + if (webMetaData != null) + dep.addAttachment(JSEArchiveMetaData.class, webMetaData); + + if (dep instanceof ArchiveDeployment) + { + URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); + dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webURL); + } + } + + // EJB3 endpoints + else if (unit.getAttachment(Ejb3Deployment.class) != null) + { + EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit); + if (ejbMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); + } + + // EJB21 endpoints + else if (unit.getAttachment(JBossMetaData.class) != null) + { + EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB21.buildMetaData(dep, unit); + if (ejbMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); + } + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,55 +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.container.jboss50.deployment.metadata; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.WSFRuntime; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ContainerMetaDataDeploymentAspect extends DeploymentAspect -{ - private ContainerMetaDataAdapter metaDataAdapter = new ContainerMetaDataAdapter(); - - public void setMetaDataAdapter(ContainerMetaDataAdapter adapter) - { - this.metaDataAdapter = adapter; - } - - @Override - public void create(Deployment dep, WSFRuntime runtime) - { - DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - metaDataAdapter.buildContainerMetaData(dep, unit); - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,55 @@ +/* + * 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.deployment.metadata; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ContainerMetaDataDeploymentAspect extends DeploymentAspect +{ + private ContainerMetaDataAdapter metaDataAdapter = new ContainerMetaDataAdapter(); + + public void setMetaDataAdapter(ContainerMetaDataAdapter adapter) + { + this.metaDataAdapter = adapter; + } + + @Override + public void create(Deployment dep, WSFRuntime runtime) + { + DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + metaDataAdapter.buildContainerMetaData(dep, unit); + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,176 +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.container.jboss50.deployment.metadata; - -// $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.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; -import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; -import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData; -import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.ejb.jboss.WebservicesMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class EJBArchiveMetaDataAdapterEJB21 -{ - // logging support - private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB21.class); - - public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) - { - JBossMetaData jbossMetaData = unit.getAttachment(JBossMetaData.class); - dep.addAttachment(JBossMetaData.class, jbossMetaData); - - EJBArchiveMetaData ejbMetaData = new EJBArchiveMetaData(); - buildEnterpriseBeansMetaData(ejbMetaData, jbossMetaData); - buildWebservicesMetaData(ejbMetaData, jbossMetaData); - ejbMetaData.setSecurityDomain(jbossMetaData.getSecurityDomain()); - - return ejbMetaData; - } - - private void buildEnterpriseBeansMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData) - { - List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>(); - JBossEnterpriseBeansMetaData sourceBeans = jbossMetaData.getEnterpriseBeans(); - Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator(); - while (it.hasNext()) - { - JBossEnterpriseBeanMetaData bmd = it.next(); - buildBeanMetaData(targetBeans, bmd); - } - ejbMetaData.setEnterpriseBeans(targetBeans); - } - - private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData) - { - WebservicesMetaData webservices = jbossMetaData.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - ejbMetaData.setWebServiceContextRoot(contextRoot); - - ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - WebserviceDescriptionsMetaData wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions != null) - { - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); - ejbMetaData.setConfigName(wsd.getConfigName()); - ejbMetaData.setConfigFile(wsd.getConfigFile()); - } - } - } - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); - if (wsDescriptions != null && wsDescriptions.get(name) != null) - { - WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name); - wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation(); - } - return wsdlPublishLocation; - } - }; - } - - private EJBMetaData buildBeanMetaData(List<EJBMetaData> ejbBeans, JBossEnterpriseBeanMetaData jbossBeansMetaData) - { - EJBMetaData targetBean = null; - if (jbossBeansMetaData.isSession()) - { - targetBean = new SLSBMetaData(); - JBossSessionBeanMetaData jbossSessionBean = (JBossSessionBeanMetaData)jbossBeansMetaData; - - targetBean.setEjbName(jbossSessionBean.getEjbName()); - targetBean.setEjbClass(jbossSessionBean.getEjbClass()); - targetBean.setServiceEndpointInterface(jbossSessionBean.getServiceEndpoint()); - targetBean.setHome(jbossSessionBean.getHome()); - targetBean.setLocalHome(jbossSessionBean.getLocalHome()); - targetBean.setJndiName(jbossSessionBean.determineJndiName()); - targetBean.setLocalJndiName(jbossBeansMetaData.determineLocalJndiName()); - - PortComponent pcmd = jbossSessionBean.getPortComponent(); - if (pcmd != null) - { - targetBean.setPortComponentName(pcmd.getPortComponentName()); - targetBean.setPortComponentURI(pcmd.getPortComponentURI()); - EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(pcmd.getAuthMethod()); - smd.setTransportGuarantee(pcmd.getTransportGuarantee()); - smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - targetBean.setSecurityMetaData(smd); - } - } - else if (jbossBeansMetaData.isMessageDriven()) - { - targetBean = new MDBMetaData(); - JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData)jbossBeansMetaData; - - targetBean.setEjbName(jbossMessageBean.getEjbName()); - targetBean.setEjbClass(jbossMessageBean.getEjbClass()); - //targetBean.setServiceEndpointInterface(???); - //targetBean.setJndiName(???); - targetBean.setLocalJndiName(jbossBeansMetaData.getLocalJndiName()); - ((MDBMetaData)targetBean).setDestinationJndiName(jbossMessageBean.getDestinationJndiName()); - } - - if (targetBean != null) - ejbBeans.add(targetBean); - - return targetBean; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,176 @@ +/* + * 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.deployment.metadata; + +// $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.common.jboss.WebserviceDescriptionMetaData; +import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; +import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; +import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData; +import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; +import org.jboss.metadata.ejb.jboss.WebservicesMetaData; +import org.jboss.metadata.javaee.spec.PortComponent; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBArchiveMetaDataAdapterEJB21 +{ + // logging support + private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB21.class); + + public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) + { + JBossMetaData jbossMetaData = unit.getAttachment(JBossMetaData.class); + dep.addAttachment(JBossMetaData.class, jbossMetaData); + + EJBArchiveMetaData ejbMetaData = new EJBArchiveMetaData(); + buildEnterpriseBeansMetaData(ejbMetaData, jbossMetaData); + buildWebservicesMetaData(ejbMetaData, jbossMetaData); + ejbMetaData.setSecurityDomain(jbossMetaData.getSecurityDomain()); + + return ejbMetaData; + } + + private void buildEnterpriseBeansMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData) + { + List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>(); + JBossEnterpriseBeansMetaData sourceBeans = jbossMetaData.getEnterpriseBeans(); + Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator(); + while (it.hasNext()) + { + JBossEnterpriseBeanMetaData bmd = it.next(); + buildBeanMetaData(targetBeans, bmd); + } + ejbMetaData.setEnterpriseBeans(targetBeans); + } + + private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData) + { + WebservicesMetaData webservices = jbossMetaData.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + ejbMetaData.setWebServiceContextRoot(contextRoot); + + ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + WebserviceDescriptionsMetaData wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions != null) + { + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); + ejbMetaData.setConfigName(wsd.getConfigName()); + ejbMetaData.setConfigFile(wsd.getConfigFile()); + } + } + } + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); + if (wsDescriptions != null && wsDescriptions.get(name) != null) + { + WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name); + wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation(); + } + return wsdlPublishLocation; + } + }; + } + + private EJBMetaData buildBeanMetaData(List<EJBMetaData> ejbBeans, JBossEnterpriseBeanMetaData jbossBeansMetaData) + { + EJBMetaData targetBean = null; + if (jbossBeansMetaData.isSession()) + { + targetBean = new SLSBMetaData(); + JBossSessionBeanMetaData jbossSessionBean = (JBossSessionBeanMetaData)jbossBeansMetaData; + + targetBean.setEjbName(jbossSessionBean.getEjbName()); + targetBean.setEjbClass(jbossSessionBean.getEjbClass()); + targetBean.setServiceEndpointInterface(jbossSessionBean.getServiceEndpoint()); + targetBean.setHome(jbossSessionBean.getHome()); + targetBean.setLocalHome(jbossSessionBean.getLocalHome()); + targetBean.setJndiName(jbossSessionBean.determineJndiName()); + targetBean.setLocalJndiName(jbossBeansMetaData.determineLocalJndiName()); + + PortComponent pcmd = jbossSessionBean.getPortComponent(); + if (pcmd != null) + { + targetBean.setPortComponentName(pcmd.getPortComponentName()); + targetBean.setPortComponentURI(pcmd.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcmd.getAuthMethod()); + smd.setTransportGuarantee(pcmd.getTransportGuarantee()); + smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + targetBean.setSecurityMetaData(smd); + } + } + else if (jbossBeansMetaData.isMessageDriven()) + { + targetBean = new MDBMetaData(); + JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData)jbossBeansMetaData; + + targetBean.setEjbName(jbossMessageBean.getEjbName()); + targetBean.setEjbClass(jbossMessageBean.getEjbClass()); + //targetBean.setServiceEndpointInterface(???); + //targetBean.setJndiName(???); + targetBean.setLocalJndiName(jbossBeansMetaData.getLocalJndiName()); + ((MDBMetaData)targetBean).setDestinationJndiName(jbossMessageBean.getDestinationJndiName()); + } + + if (targetBean != null) + ejbBeans.add(targetBean); + + return targetBean; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,185 +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.container.jboss50.deployment.metadata; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -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.mdb.MessagingContainer; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; -import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; -import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.ejb.jboss.WebservicesMetaData; -import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Apr-2007 - */ -public class EJBArchiveMetaDataAdapterEJB3 -{ - // logging support - private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class); - - public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); - - EJBArchiveMetaData umd = new EJBArchiveMetaData(); - buildEnterpriseBeansMetaData(umd, ejb3Deployment); - - JBossMetaData jbMetaData = unit.getAttachment(JBossMetaData.class); - if (jbMetaData != null) - buildWebservicesMetaData(umd, jbMetaData); - - return umd; - } - - private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbMetaData) - { - WebservicesMetaData wsMetaData = jbMetaData.getWebservices(); - if (wsMetaData != null) - { - String contextRoot = wsMetaData.getContextRoot(); - ejbMetaData.setWebServiceContextRoot(contextRoot); - - ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wsMetaData)); - - WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); - if (wsDescriptions != null) - { - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); - ejbMetaData.setConfigName(wsd.getConfigName()); - ejbMetaData.setConfigFile(wsd.getConfigFile()); - } - } - } - } - - private void buildEnterpriseBeansMetaData(EJBArchiveMetaData jarMetaData, Ejb3Deployment ejb3Deployment) - { - List<EJBMetaData> ejbMetaDataList = new ArrayList<EJBMetaData>(); - Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - - EJBMetaData ejbMetaData = null; - PortComponent pcMetaData = null; - if (container instanceof StatelessContainer) - { - ejbMetaData = new SLSBMetaData(); - JBossEnterpriseBeanMetaData beanMetaData = container.getXml(); - if (beanMetaData instanceof JBossGenericBeanMetaData) - { - pcMetaData = ((JBossGenericBeanMetaData)beanMetaData).getPortComponent(); - } - else if (beanMetaData instanceof JBossSessionBeanMetaData) - { - pcMetaData = ((JBossSessionBeanMetaData)beanMetaData).getPortComponent(); - } - } - else if (container instanceof MessagingContainer) - { - ejbMetaData = new MDBMetaData(); - MessagingContainer mdb = (MessagingContainer)container; - Map props = mdb.getActivationConfigProperties(); - if (props != null) - { - ActivationConfigPropertyMetaData destProp = (ActivationConfigPropertyMetaData)props.get("destination"); - if (destProp != null) - { - String destination = destProp.getValue(); - ((MDBMetaData)ejbMetaData).setDestinationJndiName(destination); - } - } - } - - if (ejbMetaData != null) - { - ejbMetaData.setEjbName(container.getEjbName()); - ejbMetaData.setEjbClass(container.getBeanClassName()); - - if (pcMetaData != null) - { - ejbMetaData.setPortComponentName(pcMetaData.getPortComponentName()); - ejbMetaData.setPortComponentURI(pcMetaData.getPortComponentURI()); - EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(pcMetaData.getAuthMethod()); - smd.setTransportGuarantee(pcMetaData.getTransportGuarantee()); - smd.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); - ejbMetaData.setSecurityMetaData(smd); - } - - ejbMetaDataList.add(ejbMetaData); - } - } - - jarMetaData.setEnterpriseBeans(ejbMetaDataList); - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData) - { - return new PublishLocationAdapter() { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); - if (wsDescriptions != null && wsDescriptions.get(name) != null) - { - WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name); - wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation(); - } - return wsdlPublishLocation; - } - }; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,185 @@ +/* + * 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.deployment.metadata; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +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.mdb.MessagingContainer; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; +import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; +import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; +import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; +import org.jboss.metadata.ejb.jboss.WebservicesMetaData; +import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData; +import org.jboss.metadata.javaee.spec.PortComponent; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Apr-2007 + */ +public class EJBArchiveMetaDataAdapterEJB3 +{ + // logging support + private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class); + + public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); + + EJBArchiveMetaData umd = new EJBArchiveMetaData(); + buildEnterpriseBeansMetaData(umd, ejb3Deployment); + + JBossMetaData jbMetaData = unit.getAttachment(JBossMetaData.class); + if (jbMetaData != null) + buildWebservicesMetaData(umd, jbMetaData); + + return umd; + } + + private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbMetaData) + { + WebservicesMetaData wsMetaData = jbMetaData.getWebservices(); + if (wsMetaData != null) + { + String contextRoot = wsMetaData.getContextRoot(); + ejbMetaData.setWebServiceContextRoot(contextRoot); + + ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wsMetaData)); + + WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); + if (wsDescriptions != null) + { + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); + ejbMetaData.setConfigName(wsd.getConfigName()); + ejbMetaData.setConfigFile(wsd.getConfigFile()); + } + } + } + } + + private void buildEnterpriseBeansMetaData(EJBArchiveMetaData jarMetaData, Ejb3Deployment ejb3Deployment) + { + List<EJBMetaData> ejbMetaDataList = new ArrayList<EJBMetaData>(); + Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + + EJBMetaData ejbMetaData = null; + PortComponent pcMetaData = null; + if (container instanceof StatelessContainer) + { + ejbMetaData = new SLSBMetaData(); + JBossEnterpriseBeanMetaData beanMetaData = container.getXml(); + if (beanMetaData instanceof JBossGenericBeanMetaData) + { + pcMetaData = ((JBossGenericBeanMetaData)beanMetaData).getPortComponent(); + } + else if (beanMetaData instanceof JBossSessionBeanMetaData) + { + pcMetaData = ((JBossSessionBeanMetaData)beanMetaData).getPortComponent(); + } + } + else if (container instanceof MessagingContainer) + { + ejbMetaData = new MDBMetaData(); + MessagingContainer mdb = (MessagingContainer)container; + Map props = mdb.getActivationConfigProperties(); + if (props != null) + { + ActivationConfigPropertyMetaData destProp = (ActivationConfigPropertyMetaData)props.get("destination"); + if (destProp != null) + { + String destination = destProp.getValue(); + ((MDBMetaData)ejbMetaData).setDestinationJndiName(destination); + } + } + } + + if (ejbMetaData != null) + { + ejbMetaData.setEjbName(container.getEjbName()); + ejbMetaData.setEjbClass(container.getBeanClassName()); + + if (pcMetaData != null) + { + ejbMetaData.setPortComponentName(pcMetaData.getPortComponentName()); + ejbMetaData.setPortComponentURI(pcMetaData.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcMetaData.getAuthMethod()); + smd.setTransportGuarantee(pcMetaData.getTransportGuarantee()); + smd.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); + ejbMetaData.setSecurityMetaData(smd); + } + + ejbMetaDataList.add(ejbMetaData); + } + } + + jarMetaData.setEnterpriseBeans(ejbMetaDataList); + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData) + { + return new PublishLocationAdapter() { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions(); + if (wsDescriptions != null && wsDescriptions.get(name) != null) + { + WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name); + wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation(); + } + return wsdlPublishLocation; + } + }; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,206 +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.container.jboss50.deployment.metadata; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; -import org.jboss.metadata.ear.jboss.JBossAppMetaData; -import org.jboss.metadata.ear.spec.ModuleMetaData; -import org.jboss.metadata.ear.spec.WebModuleMetaData; -import org.jboss.metadata.javaee.spec.ParamValueMetaData; -import org.jboss.metadata.web.jboss.JBossServletsMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.SecurityConstraintMetaData; -import org.jboss.metadata.web.spec.ServletMappingMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.metadata.web.spec.WebResourceCollectionMetaData; -import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class JSEArchiveMetaDataAdapter -{ - // logging support - private static Logger log = Logger.getLogger(JSEArchiveMetaDataAdapter.class); - - public JSEArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) - { - String contextRoot = null; - - JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class); - dep.addAttachment(JBossWebMetaData.class, jbossWebMetaData); - - if (unit.getParent() != null) - { - JBossAppMetaData appmd = unit.getParent().getAttachment(JBossAppMetaData.class); - if (appmd != null) - { - ModuleMetaData module = appmd.getModule(dep.getSimpleName()); - if (module != null) - { - WebModuleMetaData web = (WebModuleMetaData) module.getValue(); - contextRoot = web.getContextRoot(); - } - } - } - - if (contextRoot == null) - contextRoot = jbossWebMetaData.getContextRoot(); - - JSEArchiveMetaData umd = new JSEArchiveMetaData(); - umd.setContextRoot(contextRoot); - umd.setServletMappings(getServletMappings(jbossWebMetaData)); - umd.setServletClassNames(getServletClassMap(jbossWebMetaData)); - umd.setSecurityDomain(jbossWebMetaData.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(jbossWebMetaData)); - umd.setSecurityMetaData(getSecurityMetaData(jbossWebMetaData.getSecurityContraints())); - - setConfigNameAndFile(umd, jbossWebMetaData); - - return umd; - } - - private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData jbossWebMetaData) - { - String configName = null; - String configFile = null; - - WebserviceDescriptionsMetaData wsDescriptions = jbossWebMetaData.getWebserviceDescriptions(); - if (wsDescriptions != null && wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions != null && wsDescriptions.size() > 0) - { - WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); - configName = wsd.getConfigName(); - configFile = wsd.getConfigFile(); - } - - List<ParamValueMetaData> contextParams = jbossWebMetaData.getContextParams(); - if (contextParams != null) - { - for (ParamValueMetaData ctxParam : contextParams) - { - if (ctxParam.getParamName().equals("jbossws-config-name")) - configName = ctxParam.getParamValue(); - if (ctxParam.getParamName().equals("jbossws-config-file")) - configFile = ctxParam.getParamValue(); - } - } - - umd.setConfigName(configName); - umd.setConfigFile(configFile); - } - - private PublishLocationAdapter getPublishLocationAdpater(final JBossWebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - WebserviceDescriptionsMetaData wsdmd = wmd.getWebserviceDescriptions(); - WebserviceDescriptionMetaData wsmd = wsdmd.get(name); - String location = null; - if (wsmd != null) - location = wsmd.getWsdlPublishLocation(); - return location; - } - }; - } - - protected List<JSESecurityMetaData> getSecurityMetaData(final List<SecurityConstraintMetaData> securityConstraints) - { - ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>(); - if (securityConstraints != null) - { - for (SecurityConstraintMetaData securityMetaData : securityConstraints) - { - JSESecurityMetaData current = new JSESecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee().name()); - - WebResourceCollectionsMetaData resources = securityMetaData.getResourceCollections(); - for (WebResourceCollectionMetaData webResource : resources) - { - JSEResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - } - } - return unifiedsecurityMetaData; - } - - private Map<String, String> getServletMappings(JBossWebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - List<ServletMappingMetaData> smappings = wmd.getServletMappings(); - if (smappings != null) - { - for(ServletMappingMetaData mapping : smappings) - { - // FIXME - Add support for multiple mappings - mappings.put(mapping.getServletName(), mapping.getUrlPatterns().get(0)); - } - } - return mappings; - } - - private Map<String, String> getServletClassMap(JBossWebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - JBossServletsMetaData servlets = wmd.getServlets(); - if (servlets != null) - { - for (ServletMetaData servlet : servlets) - { - // Skip JSPs - if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) - continue; - - mappings.put(servlet.getName(), servlet.getServletClass()); - } - } - return mappings; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,206 @@ +/* + * 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.deployment.metadata; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; +import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; +import org.jboss.metadata.ear.jboss.JBossAppMetaData; +import org.jboss.metadata.ear.spec.ModuleMetaData; +import org.jboss.metadata.ear.spec.WebModuleMetaData; +import org.jboss.metadata.javaee.spec.ParamValueMetaData; +import org.jboss.metadata.web.jboss.JBossServletsMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.SecurityConstraintMetaData; +import org.jboss.metadata.web.spec.ServletMappingMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.metadata.web.spec.WebResourceCollectionMetaData; +import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class JSEArchiveMetaDataAdapter +{ + // logging support + private static Logger log = Logger.getLogger(JSEArchiveMetaDataAdapter.class); + + public JSEArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit) + { + String contextRoot = null; + + JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class); + dep.addAttachment(JBossWebMetaData.class, jbossWebMetaData); + + if (unit.getParent() != null) + { + JBossAppMetaData appmd = unit.getParent().getAttachment(JBossAppMetaData.class); + if (appmd != null) + { + ModuleMetaData module = appmd.getModule(dep.getSimpleName()); + if (module != null) + { + WebModuleMetaData web = (WebModuleMetaData) module.getValue(); + contextRoot = web.getContextRoot(); + } + } + } + + if (contextRoot == null) + contextRoot = jbossWebMetaData.getContextRoot(); + + JSEArchiveMetaData umd = new JSEArchiveMetaData(); + umd.setContextRoot(contextRoot); + umd.setServletMappings(getServletMappings(jbossWebMetaData)); + umd.setServletClassNames(getServletClassMap(jbossWebMetaData)); + umd.setSecurityDomain(jbossWebMetaData.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(jbossWebMetaData)); + umd.setSecurityMetaData(getSecurityMetaData(jbossWebMetaData.getSecurityContraints())); + + setConfigNameAndFile(umd, jbossWebMetaData); + + return umd; + } + + private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData jbossWebMetaData) + { + String configName = null; + String configFile = null; + + WebserviceDescriptionsMetaData wsDescriptions = jbossWebMetaData.getWebserviceDescriptions(); + if (wsDescriptions != null && wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions != null && wsDescriptions.size() > 0) + { + WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next(); + configName = wsd.getConfigName(); + configFile = wsd.getConfigFile(); + } + + List<ParamValueMetaData> contextParams = jbossWebMetaData.getContextParams(); + if (contextParams != null) + { + for (ParamValueMetaData ctxParam : contextParams) + { + if (ctxParam.getParamName().equals("jbossws-config-name")) + configName = ctxParam.getParamValue(); + if (ctxParam.getParamName().equals("jbossws-config-file")) + configFile = ctxParam.getParamValue(); + } + } + + umd.setConfigName(configName); + umd.setConfigFile(configFile); + } + + private PublishLocationAdapter getPublishLocationAdpater(final JBossWebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + WebserviceDescriptionsMetaData wsdmd = wmd.getWebserviceDescriptions(); + WebserviceDescriptionMetaData wsmd = wsdmd.get(name); + String location = null; + if (wsmd != null) + location = wsmd.getWsdlPublishLocation(); + return location; + } + }; + } + + protected List<JSESecurityMetaData> getSecurityMetaData(final List<SecurityConstraintMetaData> securityConstraints) + { + ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>(); + if (securityConstraints != null) + { + for (SecurityConstraintMetaData securityMetaData : securityConstraints) + { + JSESecurityMetaData current = new JSESecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee().name()); + + WebResourceCollectionsMetaData resources = securityMetaData.getResourceCollections(); + for (WebResourceCollectionMetaData webResource : resources) + { + JSEResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + } + } + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletMappings(JBossWebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + List<ServletMappingMetaData> smappings = wmd.getServletMappings(); + if (smappings != null) + { + for(ServletMappingMetaData mapping : smappings) + { + // FIXME - Add support for multiple mappings + mappings.put(mapping.getServletName(), mapping.getUrlPatterns().get(0)); + } + } + return mappings; + } + + private Map<String, String> getServletClassMap(JBossWebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + JBossServletsMetaData servlets = wmd.getServlets(); + if (servlets != null) + { + for (ServletMetaData servlet : servlets) + { + // Skip JSPs + if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) + continue; + + mappings.put(servlet.getName(), servlet.getServletClass()); + } + } + return mappings; + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,169 +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.container.jboss50.deployment.tomcat; - -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.transport.HttpSpec; - -/** - * Modifies web.xml for jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2006 - */ -public class DefaultWebAppDescriptorModifierImpl implements WebAppDescriptorModifier -{ - // logging support - private static Logger log = Logger.getLogger(DefaultWebAppDescriptorModifierImpl.class); - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - Element root = webXml.getRootElement(); - - String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); - if (servletClass == null) - throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); - - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); - if (contextParams != null) - { - for (Map.Entry<String, String> entry : contextParams.entrySet()) - { - // Ugly way to insert at position 0 - Element contextParamTmp = root.addElement("context-param-tmp"); - - Element contextParam = (Element)contextParamTmp.clone(); - contextParam.setName("context-param"); - contextParam.addElement("param-name").addText(entry.getKey()); - contextParam.addElement("param-value").addText(entry.getValue()); - root.content().add(0, contextParam); - - root.remove(contextParamTmp); - } - } - - String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); - 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; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,169 @@ +/* + * 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.deployment.tomcat; + +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.transport.HttpSpec; + +/** + * Modifies web.xml for jbossws + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2006 + */ +public class DefaultWebAppDescriptorModifierImpl implements WebAppDescriptorModifier +{ + // logging support + private static Logger log = Logger.getLogger(DefaultWebAppDescriptorModifierImpl.class); + + public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException + { + RewriteResults results = new RewriteResults(); + Element root = webXml.getRootElement(); + + String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); + if (servletClass == null) + throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); + + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); + if (contextParams != null) + { + for (Map.Entry<String, String> entry : contextParams.entrySet()) + { + // Ugly way to insert at position 0 + Element contextParamTmp = root.addElement("context-param-tmp"); + + Element contextParam = (Element)contextParamTmp.clone(); + contextParam.setName("context-param"); + contextParam.addElement("param-name").addText(entry.getKey()); + contextParam.addElement("param-value").addText(entry.getValue()); + root.content().add(0, contextParam); + + root.remove(contextParamTmp); + } + } + + String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); + 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; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,174 +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.container.jboss50.deployment.tomcat; - -//$Id$ - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.jboss.metadata.javaee.spec.ParamValueMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ListenerMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -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.transport.HttpSpec; -import org.jboss.wsf.spi.WSFRuntime; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect -{ - @Override - public void create(Deployment dep, WSFRuntime runtime) - { - String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); - if (servletClass == null) - throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); - - modifyServletClass(dep, servletClass); - - String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); - if (listenerClass != null) - modifyListener(dep, listenerClass); - - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); - if (contextParams != null) - modifyContextParams(dep, contextParams); - } - - private void modifyServletClass(Deployment dep, String servletClass) - { - JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); - if (webMetaData != null) - { - for (ServletMetaData servlet : webMetaData.getServlets()) - { - String endpointClass = servlet.getServletClass(); - - // JSP - if (endpointClass == null || endpointClass.length() == 0) - { - log.debug("Ignore servlet class: " + endpointClass); - continue; - } - - // Nothing to do if we have an <init-param> - if (!isAlreadyModified(servlet) && !isJavaxServlet(endpointClass, dep.getInitialClassLoader())) - { - servlet.setServletClass(servletClass); - ParamValueMetaData initParam = new ParamValueMetaData(); - initParam.setParamName(Endpoint.SEPID_DOMAIN_ENDPOINT); - initParam.setParamValue(endpointClass); - List<ParamValueMetaData> initParams = servlet.getInitParam(); - if (initParams == null) - { - initParams = new ArrayList<ParamValueMetaData>(); - servlet.setInitParam(initParams); - } - initParams.add(initParam); - } - } - } - } - - private void modifyListener(Deployment dep, String listenerClass) - { - JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); - if (webMetaData != null) - { - ListenerMetaData listener = new ListenerMetaData(); - listener.setListenerClass(listenerClass); - List<ListenerMetaData> listeners = webMetaData.getListeners(); - if (listeners == null) - { - listeners = new ArrayList<ListenerMetaData>(); - webMetaData.setListeners(listeners); - } - listeners.add(listener); - } - } - - private void modifyContextParams(Deployment dep, Map<String, String> newParams) - { - JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); - if (webMetaData != null) - { - for (Map.Entry<String, String> entry : newParams.entrySet()) - { - ParamValueMetaData ctxParam = new ParamValueMetaData(); - ctxParam.setParamName(entry.getKey()); - ctxParam.setParamValue(entry.getValue()); - List<ParamValueMetaData> contextParams = webMetaData.getContextParams(); - if (contextParams == null) - { - contextParams = new ArrayList<ParamValueMetaData>(); - webMetaData.setContextParams(contextParams); - } - contextParams.add(ctxParam); - } - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } - - private boolean isAlreadyModified(ServletMetaData servlet) - { - List<ParamValueMetaData> initParams = servlet.getInitParam(); - if (initParams != null) - { - for (ParamValueMetaData param : initParams) - { - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(param.getParamName())) - return true; - } - } - return false; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,174 @@ +/* + * 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.deployment.tomcat; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.jboss.metadata.javaee.spec.ParamValueMetaData; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ListenerMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +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.transport.HttpSpec; +import org.jboss.wsf.spi.WSFRuntime; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep, WSFRuntime runtime) + { + String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); + if (servletClass == null) + throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS); + + modifyServletClass(dep, servletClass); + + String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); + if (listenerClass != null) + modifyListener(dep, listenerClass); + + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); + if (contextParams != null) + modifyContextParams(dep, contextParams); + } + + private void modifyServletClass(Deployment dep, String servletClass) + { + JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); + if (webMetaData != null) + { + for (ServletMetaData servlet : webMetaData.getServlets()) + { + String endpointClass = servlet.getServletClass(); + + // JSP + if (endpointClass == null || endpointClass.length() == 0) + { + log.debug("Ignore servlet class: " + endpointClass); + continue; + } + + // Nothing to do if we have an <init-param> + if (!isAlreadyModified(servlet) && !isJavaxServlet(endpointClass, dep.getInitialClassLoader())) + { + servlet.setServletClass(servletClass); + ParamValueMetaData initParam = new ParamValueMetaData(); + initParam.setParamName(Endpoint.SEPID_DOMAIN_ENDPOINT); + initParam.setParamValue(endpointClass); + List<ParamValueMetaData> initParams = servlet.getInitParam(); + if (initParams == null) + { + initParams = new ArrayList<ParamValueMetaData>(); + servlet.setInitParam(initParams); + } + initParams.add(initParam); + } + } + } + } + + private void modifyListener(Deployment dep, String listenerClass) + { + JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); + if (webMetaData != null) + { + ListenerMetaData listener = new ListenerMetaData(); + listener.setListenerClass(listenerClass); + List<ListenerMetaData> listeners = webMetaData.getListeners(); + if (listeners == null) + { + listeners = new ArrayList<ListenerMetaData>(); + webMetaData.setListeners(listeners); + } + listeners.add(listener); + } + } + + private void modifyContextParams(Deployment dep, Map<String, String> newParams) + { + JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); + if (webMetaData != null) + { + for (Map.Entry<String, String> entry : newParams.entrySet()) + { + ParamValueMetaData ctxParam = new ParamValueMetaData(); + ctxParam.setParamName(entry.getKey()); + ctxParam.setParamValue(entry.getValue()); + List<ParamValueMetaData> contextParams = webMetaData.getContextParams(); + if (contextParams == null) + { + contextParams = new ArrayList<ParamValueMetaData>(); + webMetaData.setContextParams(contextParams); + } + contextParams.add(ctxParam); + } + } + } + + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) + { + boolean isServlet = false; + if (loader != null) + { + try + { + Class servletClass = loader.loadClass(orgServletClass); + isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); + if (isServlet == true) + { + log.info("Ignore servlet: " + orgServletClass); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + orgServletClass); + } + } + return isServlet; + } + + private boolean isAlreadyModified(ServletMetaData servlet) + { + List<ParamValueMetaData> initParams = servlet.getInitParam(); + if (initParams != null) + { + for (ParamValueMetaData param : initParams) + { + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(param.getParamName())) + return true; + } + } + return false; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss50.deployment.tomcat; - -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>(); -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50.deployment.tomcat; + +import java.net.URL; +import java.util.Map; +import java.util.HashMap; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class RewriteResults +{ + // The URL to the rewritten web.xml + public URL webXML; + // Maps the servlet name to the target bean + public Map<String, String> sepTargetMap = new HashMap<String, String>(); +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,78 +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.container.jboss50.deployment.tomcat; - -//$Id$ - -import org.dom4j.Element; -import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.deployment.SecurityHandler; - -import java.util.Iterator; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityHandlerEJB21 implements SecurityHandler -{ - public void addSecurityDomain(Element jbossWeb, Deployment dep) - { - EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class); - if (ejbMetaData == null) - throw new IllegalStateException("Cannot obtain application meta data"); - - String securityDomain = ejbMetaData.getSecurityDomain(); - if (securityDomain != null) - { - if (securityDomain.startsWith("java:/jaas/") == false) - securityDomain = "java:/jaas/" + securityDomain; - - jbossWeb.addElement("security-domain").addText(securityDomain); - } - } - - public void addSecurityRoles(Element webApp, Deployment dep) - { - // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - JBossMetaData jbmd = dep.getAttachment(JBossMetaData.class); - IAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor(); - if (assemblyDescriptor != null) - { - SecurityRolesMetaData srmd = assemblyDescriptor.getSecurityRoles(); - if (srmd != null) - { - Iterator it = srmd.keySet().iterator(); - while (it.hasNext()) - { - webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); - } - } - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,78 @@ +/* + * 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.deployment.tomcat; + +//$Id$ + +import org.dom4j.Element; +import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.deployment.SecurityHandler; + +import java.util.Iterator; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityHandlerEJB21 implements SecurityHandler +{ + public void addSecurityDomain(Element jbossWeb, Deployment dep) + { + EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class); + if (ejbMetaData == null) + throw new IllegalStateException("Cannot obtain application meta data"); + + String securityDomain = ejbMetaData.getSecurityDomain(); + if (securityDomain != null) + { + if (securityDomain.startsWith("java:/jaas/") == false) + securityDomain = "java:/jaas/" + securityDomain; + + jbossWeb.addElement("security-domain").addText(securityDomain); + } + } + + public void addSecurityRoles(Element webApp, Deployment dep) + { + // Fix: http://jira.jboss.org/jira/browse/JBWS-309 + JBossMetaData jbmd = dep.getAttachment(JBossMetaData.class); + IAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor(); + if (assemblyDescriptor != null) + { + SecurityRolesMetaData srmd = assemblyDescriptor.getSecurityRoles(); + if (srmd != null) + { + Iterator it = srmd.keySet().iterator(); + while (it.hasNext()) + { + webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); + } + } + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,96 +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.container.jboss50.deployment.tomcat; - -//$Id$ - -import java.util.Iterator; - -import javax.annotation.security.RolesAllowed; - -import org.dom4j.Element; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.annotation.SecurityDomain; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.SecurityHandler; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityHandlerEJB3 implements SecurityHandler -{ - public void addSecurityDomain(Element jbossWeb, Deployment dep) - { - String securityDomain = null; - - Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment != null) - { - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - SecurityDomain anSecurityDomain = (SecurityDomain)container.resolveAnnotation(SecurityDomain.class); - if (anSecurityDomain != null) - { - if (securityDomain != null && !securityDomain.equals(anSecurityDomain.value())) - throw new IllegalStateException("Multiple security domains not supported"); - - securityDomain = anSecurityDomain.value(); - } - } - } - - if (securityDomain != null) - { - if (securityDomain.startsWith("java:/jaas/") == false) - securityDomain = "java:/jaas/" + securityDomain; - - jbossWeb.addElement("security-domain").addText(securityDomain); - } - } - - public void addSecurityRoles(Element webApp, Deployment dep) - { - Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment != null) - { - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); - if (anRolesAllowed != null) - { - for (String role : anRolesAllowed.value()) - { - webApp.addElement("security-role").addElement("role-name").addText(role); - } - } - } - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,96 @@ +/* + * 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.deployment.tomcat; + +//$Id$ + +import java.util.Iterator; + +import javax.annotation.security.RolesAllowed; + +import org.dom4j.Element; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.annotation.SecurityDomain; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.SecurityHandler; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityHandlerEJB3 implements SecurityHandler +{ + public void addSecurityDomain(Element jbossWeb, Deployment dep) + { + String securityDomain = null; + + Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment != null) + { + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + SecurityDomain anSecurityDomain = (SecurityDomain)container.resolveAnnotation(SecurityDomain.class); + if (anSecurityDomain != null) + { + if (securityDomain != null && !securityDomain.equals(anSecurityDomain.value())) + throw new IllegalStateException("Multiple security domains not supported"); + + securityDomain = anSecurityDomain.value(); + } + } + } + + if (securityDomain != null) + { + if (securityDomain.startsWith("java:/jaas/") == false) + securityDomain = "java:/jaas/" + securityDomain; + + jbossWeb.addElement("security-domain").addText(securityDomain); + } + } + + public void addSecurityRoles(Element webApp, Deployment dep) + { + Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment != null) + { + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); + if (anRolesAllowed != null) + { + for (String role : anRolesAllowed.value()) + { + webApp.addElement("security-role").addElement("role-name").addText(role); + } + } + } + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,36 +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.container.jboss50.deployment.tomcat; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.dom4j.Document; - -/** - * Modifies the web app according to the stack requirements. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public interface WebAppDescriptorModifier -{ - RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebAppDescriptorModifier.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,36 @@ +/* + * 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.deployment.tomcat; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.dom4j.Document; + +/** + * Modifies the web app according to the stack requirements. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public interface WebAppDescriptorModifier +{ + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,133 +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.container.jboss50.deployment.tomcat; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.transport.HttpSpec; -import org.jboss.wsf.common.IOUtils; -import org.dom4j.io.SAXReader; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.XMLWriter; -import org.dom4j.Document; - -import javax.xml.ws.WebServiceException; -import java.net.URL; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -/** - * The rewriter for web.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public class WebXMLRewriterImpl -{ - private WebAppDescriptorModifier descriptorModifier; - - public WebXMLRewriterImpl() - { - this.descriptorModifier = new DefaultWebAppDescriptorModifierImpl(); - } - - public WebAppDescriptorModifier getDescriptorModifier() - { - return descriptorModifier; - } - - public void setDescriptorModifier(WebAppDescriptorModifier descriptorModifier) - { - this.descriptorModifier = descriptorModifier; - } - - public RewriteResults rewriteWebXml(Deployment dep) - { - URL warURL = (URL)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_URL); - File warFile = new File(warURL.getFile()); - if (warFile.isDirectory() == false) - throw new WebServiceException("Expected a war directory: " + warURL); - - File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); - if (webXML.isFile() == false) - throw new WebServiceException("Cannot find web.xml: " + webXML); - - try - { - // After redeployment there might be a stale copy of the original web.xml.org, we delete it - File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); - orgWebXML.delete(); - - // Rename the web.xml - if (webXML.renameTo(orgWebXML) == false) - throw new WebServiceException("Cannot rename web.xml: " + orgWebXML); - - return rewriteWebXml(orgWebXML, webXML, dep); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new WebServiceException(e); - } - } - - private RewriteResults rewriteWebXml(File input, File destFile, Deployment dep) throws Exception - { - if (destFile == null) - { - destFile = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); - destFile.deleteOnExit(); - } - - FileInputStream inputStream = null; - FileOutputStream outputStream = null; - - try - { - inputStream = new FileInputStream(input); - SAXReader reader = new SAXReader(); - Document document = reader.read(inputStream); - - RewriteResults results = descriptorModifier.modifyDescriptor(dep, document); - results.webXML = destFile.toURL(); - - outputStream = new FileOutputStream(destFile); - OutputFormat format = OutputFormat.createPrettyPrint(); - XMLWriter writer = new XMLWriter(outputStream, format); - writer.write(document); - writer.close(); - - return results; - } - finally - { - if(inputStream!=null) - inputStream.close(); - - if(outputStream!=null) - outputStream.close(); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,133 @@ +/* + * 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.deployment.tomcat; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.transport.HttpSpec; +import org.jboss.wsf.common.IOUtils; +import org.dom4j.io.SAXReader; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; +import org.dom4j.Document; + +import javax.xml.ws.WebServiceException; +import java.net.URL; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; + +/** + * The rewriter for web.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class WebXMLRewriterImpl +{ + private WebAppDescriptorModifier descriptorModifier; + + public WebXMLRewriterImpl() + { + this.descriptorModifier = new DefaultWebAppDescriptorModifierImpl(); + } + + public WebAppDescriptorModifier getDescriptorModifier() + { + return descriptorModifier; + } + + public void setDescriptorModifier(WebAppDescriptorModifier descriptorModifier) + { + this.descriptorModifier = descriptorModifier; + } + + public RewriteResults rewriteWebXml(Deployment dep) + { + URL warURL = (URL)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_URL); + File warFile = new File(warURL.getFile()); + if (warFile.isDirectory() == false) + throw new WebServiceException("Expected a war directory: " + warURL); + + File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); + if (webXML.isFile() == false) + throw new WebServiceException("Cannot find web.xml: " + webXML); + + try + { + // After redeployment there might be a stale copy of the original web.xml.org, we delete it + File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); + orgWebXML.delete(); + + // Rename the web.xml + if (webXML.renameTo(orgWebXML) == false) + throw new WebServiceException("Cannot rename web.xml: " + orgWebXML); + + return rewriteWebXml(orgWebXML, webXML, dep); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } + + private RewriteResults rewriteWebXml(File input, File destFile, Deployment dep) throws Exception + { + if (destFile == null) + { + destFile = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); + destFile.deleteOnExit(); + } + + FileInputStream inputStream = null; + FileOutputStream outputStream = null; + + try + { + inputStream = new FileInputStream(input); + SAXReader reader = new SAXReader(); + Document document = reader.read(inputStream); + + RewriteResults results = descriptorModifier.modifyDescriptor(dep, document); + results.webXML = destFile.toURL(); + + outputStream = new FileOutputStream(destFile); + OutputFormat format = OutputFormat.createPrettyPrint(); + XMLWriter writer = new XMLWriter(outputStream, format); + writer.write(document); + writer.close(); + + return results; + } + finally + { + if(inputStream!=null) + inputStream.close(); + + if(outputStream!=null) + outputStream.close(); + } + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,55 +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.container.jboss50.invocation; - -// $Id$ - -import java.lang.reflect.Method; - -import org.jboss.wsf.common.JavaUtils; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractInvocationHandler extends InvocationHandler -{ - protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException - { - String methodName = seiMethod.getName(); - Class[] paramTypes = seiMethod.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) - { - Class paramType = paramTypes[i]; - if (JavaUtils.isPrimitive(paramType) == false) - { - String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); - paramTypes[i] = paramType; - } - } - - Method implMethod = implClass.getMethod(methodName, paramTypes); - return implMethod; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,55 @@ +/* + * 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.invocation; + +// $Id$ + +import java.lang.reflect.Method; + +import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractInvocationHandler extends InvocationHandler +{ + protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException + { + String methodName = seiMethod.getName(); + Class[] paramTypes = seiMethod.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) + { + Class paramType = paramTypes[i]; + if (JavaUtils.isPrimitive(paramType) == false) + { + String paramTypeName = paramType.getName(); + paramType = JavaUtils.loadJavaType(paramTypeName); + paramTypes[i] = paramType; + } + } + + Method implMethod = implClass.getMethod(methodName, paramTypes); + return implMethod; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,188 +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.container.jboss50.invocation; - -// $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; -import org.jboss.invocation.InvocationKey; -import org.jboss.invocation.InvocationType; -import org.jboss.invocation.PayloadKey; -import org.jboss.logging.Logger; -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.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.HandlerCallback; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; - -/** - * Handles invocations on EJB21 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerEJB21 extends InvocationHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); - - private String jndiName; - private MBeanServer server; - private ObjectName objectName; - - InvocationHandlerEJB21() - { - } - - public Invocation createInvocation() - { - return new Invocation(); - } - - public void init(Endpoint ep) - { - String ejbName = ep.getShortName(); - Deployment dep = ep.getService().getDeployment(); - EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); - EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName); - if (beanMetaData == null) - throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); - - // get the bean's JNDI name - jndiName = beanMetaData.getContainerObjectNameJndiName(); - if (jndiName == null) - throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName); - - server = MBeanServerLocator.locateJBoss(); - objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); - if (server.isRegistered(objectName) == false) - throw new WebServiceException("Cannot find service endpoint target: " + objectName); - - // Dynamically add the service endpoint interceptor - // http://jira.jboss.org/jira/browse/JBWS-758 - try - { - EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); - StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); - - boolean injectionPointFound = false; - Interceptor prev = container.getInterceptor(); - while (prev != null && prev.getNext() != null) - { - Interceptor next = prev.getNext(); - if (next.getNext() == null) - { - log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); - ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); - prev.setNext(sepInterceptor); - sepInterceptor.setNext(next); - injectionPointFound = true; - } - prev = next; - } - if (injectionPointFound == false) - log.warn("Cannot service endpoint interceptor injection point"); - } - catch (Exception ex) - { - log.warn("Cannot add service endpoint interceptor", ex); - } - - } - - public void invoke(Endpoint ep, Invocation inv) throws Exception - { - log.debug("Invoke: " + inv.getJavaMethod().getName()); - - // invoke on the container - try - { - // setup the invocation - org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv); - - String[] sig = { org.jboss.invocation.Invocation.class.getName() }; - Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig); - inv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } - - private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv) - { - // EJB2.1 endpoints will only get an JAXRPC context - MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class); - if (msgContext == null) - throw new IllegalStateException("Cannot obtain MessageContext"); - - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); - SecurityContext sc = SecurityContextAssociation.getSecurityContext(); - Principal principal = securityAdaptor.getPrincipal(); - Object credential = securityAdaptor.getCredential(); - - if (principal == null && sc != null) - principal = sc.getUtil().getUserPrincipal(); - - if (credential == null && sc != null) - credential = sc.getUtil().getCredential(); - - Method method = inv.getJavaMethod(); - Object[] args = inv.getArgs(); - org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential); - - HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class); - if (callback == null) - throw new IllegalStateException("Cannot obtain HandlerCallback"); - - jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); - jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); - jbInv.setType(InvocationType.SERVICE_ENDPOINT); - jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); - jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT); - - return jbInv; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,188 @@ +/* + * 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.invocation; + +// $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; +import org.jboss.invocation.InvocationKey; +import org.jboss.invocation.InvocationType; +import org.jboss.invocation.PayloadKey; +import org.jboss.logging.Logger; +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.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; + +/** + * Handles invocations on EJB21 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB21 extends InvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); + + private String jndiName; + private MBeanServer server; + private ObjectName objectName; + + InvocationHandlerEJB21() + { + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + String ejbName = ep.getShortName(); + Deployment dep = ep.getService().getDeployment(); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); + EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName); + if (beanMetaData == null) + throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); + + // get the bean's JNDI name + jndiName = beanMetaData.getContainerObjectNameJndiName(); + if (jndiName == null) + throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName); + + server = MBeanServerLocator.locateJBoss(); + objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); + if (server.isRegistered(objectName) == false) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + + // Dynamically add the service endpoint interceptor + // http://jira.jboss.org/jira/browse/JBWS-758 + try + { + EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); + StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); + + boolean injectionPointFound = false; + Interceptor prev = container.getInterceptor(); + while (prev != null && prev.getNext() != null) + { + Interceptor next = prev.getNext(); + if (next.getNext() == null) + { + log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); + ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); + prev.setNext(sepInterceptor); + sepInterceptor.setNext(next); + injectionPointFound = true; + } + prev = next; + } + if (injectionPointFound == false) + log.warn("Cannot service endpoint interceptor injection point"); + } + catch (Exception ex) + { + log.warn("Cannot add service endpoint interceptor", ex); + } + + } + + public void invoke(Endpoint ep, Invocation inv) throws Exception + { + log.debug("Invoke: " + inv.getJavaMethod().getName()); + + // invoke on the container + try + { + // setup the invocation + org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv); + + String[] sig = { org.jboss.invocation.Invocation.class.getName() }; + Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig); + inv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } + + private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv) + { + // EJB2.1 endpoints will only get an JAXRPC context + MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class); + if (msgContext == null) + throw new IllegalStateException("Cannot obtain MessageContext"); + + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + SecurityContext sc = SecurityContextAssociation.getSecurityContext(); + Principal principal = securityAdaptor.getPrincipal(); + Object credential = securityAdaptor.getCredential(); + + if (principal == null && sc != null) + principal = sc.getUtil().getUserPrincipal(); + + if (credential == null && sc != null) + credential = sc.getUtil().getCredential(); + + Method method = inv.getJavaMethod(); + Object[] args = inv.getArgs(); + org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential); + + HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class); + if (callback == null) + throw new IllegalStateException("Cannot obtain HandlerCallback"); + + jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); + jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); + jbInv.setType(InvocationType.SERVICE_ENDPOINT); + jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); + jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT); + + return jbInv; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,151 +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.container.jboss50.invocation; - -// $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; -import org.jboss.ejb3.BeanContextLifecycleCallback; -import org.jboss.ejb3.EJBContainerInvocation; -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.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.InvocationType; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; - -/** - * Handles invocations on EJB3 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerEJB3 extends AbstractInvocationHandler -{ - private ObjectName objectName; - - InvocationHandlerEJB3() - { - } - - public Invocation createInvocation() - { - return new Invocation(); - } - - public void init(Endpoint ep) - { - String ejbName = ep.getShortName(); - ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment(); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName(); - if (dep.getParent() != null) - { - nameStr += ",ear=" + dep.getParent().getSimpleName(); - } - - objectName = ObjectNameFactory.create(nameStr.toString()); - - Dispatcher dispatcher = Dispatcher.singleton; - if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) - throw new WebServiceException("Cannot find service endpoint target: " + objectName); - } - - public void invoke(Endpoint ep, Invocation wsInv) throws Exception - { - try - { - Dispatcher dispatcher = Dispatcher.singleton; - StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName()); - Class beanClass = container.getBeanClass(); - - Method method = getImplMethod(beanClass, wsInv.getJavaMethod()); - Object[] args = wsInv.getArgs(); - - MethodInfo info = container.getMethodInfo(method); - EJBContainerInvocation<StatelessContainer, StatelessBeanContext> jbInv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info); - jbInv.setAdvisor(container); - jbInv.setArguments(args); - jbInv.setContextCallback(new CallbackImpl(wsInv)); - - Object retObj = jbInv.invokeNext(); - - wsInv.setReturnValue(retObj); - } - catch (Throwable th) - { - handleInvocationException(th); - } - } - - static class CallbackImpl implements BeanContextLifecycleCallback - { - private javax.xml.ws.handler.MessageContext jaxwsMessageContext; - private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; - - public CallbackImpl(Invocation epInv) - { - jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); - jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); - } - - public void attached(BeanContext beanCtx) - { - StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; - sbc.setMessageContextJAXRPC(jaxrpcMessageContext); - - BeanProperty beanProp = sbc.getWebServiceContextProperty(); - if (beanProp != null) - { - EJBContext ejbCtx = beanCtx.getEJBContext(); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtensibleWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); - wsContext.addAttachment(EJBContext.class, ejbCtx); - beanProp.set(beanCtx.getInstance(), wsContext); - } - } - - public void released(BeanContext beanCtx) - { - StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; - sbc.setMessageContextJAXRPC(null); - - BeanProperty beanProp = sbc.getWebServiceContextProperty(); - if (beanProp != null) - beanProp.set(beanCtx.getInstance(), null); - } - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,151 @@ +/* + * 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.invocation; + +// $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; +import org.jboss.ejb3.BeanContextLifecycleCallback; +import org.jboss.ejb3.EJBContainerInvocation; +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.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.InvocationType; +import org.jboss.wsf.spi.invocation.WebServiceContextFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB3 extends AbstractInvocationHandler +{ + private ObjectName objectName; + + InvocationHandlerEJB3() + { + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + String ejbName = ep.getShortName(); + ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment(); + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName(); + if (dep.getParent() != null) + { + nameStr += ",ear=" + dep.getParent().getSimpleName(); + } + + objectName = ObjectNameFactory.create(nameStr.toString()); + + Dispatcher dispatcher = Dispatcher.singleton; + if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + } + + public void invoke(Endpoint ep, Invocation wsInv) throws Exception + { + try + { + Dispatcher dispatcher = Dispatcher.singleton; + StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName()); + Class beanClass = container.getBeanClass(); + + Method method = getImplMethod(beanClass, wsInv.getJavaMethod()); + Object[] args = wsInv.getArgs(); + + MethodInfo info = container.getMethodInfo(method); + EJBContainerInvocation<StatelessContainer, StatelessBeanContext> jbInv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info); + jbInv.setAdvisor(container); + jbInv.setArguments(args); + jbInv.setContextCallback(new CallbackImpl(wsInv)); + + Object retObj = jbInv.invokeNext(); + + wsInv.setReturnValue(retObj); + } + catch (Throwable th) + { + handleInvocationException(th); + } + } + + static class CallbackImpl implements BeanContextLifecycleCallback + { + private javax.xml.ws.handler.MessageContext jaxwsMessageContext; + private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; + + public CallbackImpl(Invocation epInv) + { + jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); + jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); + } + + public void attached(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(jaxrpcMessageContext); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + { + EJBContext ejbCtx = beanCtx.getEJBContext(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ExtensibleWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + wsContext.addAttachment(EJBContext.class, ejbCtx); + beanProp.set(beanCtx.getInstance(), wsContext); + } + } + + public void released(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(null); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + beanProp.set(beanCtx.getInstance(), null); + } + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,65 +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.container.jboss50.invocation; - -import org.jboss.wsf.spi.invocation.*; - -/** - * The default invocation model factory fro AS 5.0. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory -{ - public InvocationHandler newInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new InvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXRPC_MDB21: - handler = new InvocationHandlerMDB21(); - break; - case JAXWS_JSE: - handler = new InvocationHandlerJAXWS(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - break; - case JAXWS_MDB3: - handler = new InvocationHandlerMDB3(); - break; - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,65 @@ +/* + * 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.invocation; + +import org.jboss.wsf.spi.invocation.*; + +/** + * The default invocation model factory fro AS 5.0. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler newInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new InvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new InvocationHandlerJAXWS(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + break; + case JAXWS_MDB3: + handler = new InvocationHandlerMDB3(); + break; + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,72 +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.container.jboss50.invocation; - -// $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; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerJAXRPC extends InvocationHandlerJSE -{ - 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); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,72 @@ +/* + * 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.invocation; + +// $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; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerJAXRPC extends InvocationHandlerJSE +{ + 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); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,34 +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.container.jboss50.invocation; - -// $Id$ - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerJAXWS extends InvocationHandlerJSE -{ -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.invocation; + +// $Id$ + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerJAXWS extends InvocationHandlerJSE +{ +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,128 +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.container.jboss50.invocation; - -// $Id$ - -import java.lang.reflect.Method; - -import javax.xml.ws.WebServiceContext; - -import org.jboss.wsf.common.JavaUtils; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -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.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.ResourceInjector; -import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerJSE extends InvocationHandler -{ - private SPIProvider spiProvider; - private ResourceInjectorFactory resourceInjectorFactory; - - public InvocationHandlerJSE() - { - spiProvider = SPIProviderResolver.getInstance().getProvider(); - resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class); - } - - public Invocation createInvocation() - { - return new Invocation(); - } - - public void init(Endpoint ep) - { - } - - protected Object getTargetBean(Endpoint ep, Invocation epInv) - { - InvocationContext invCtx = epInv.getInvocationContext(); - Object targetBean = invCtx.getTargetBean(); - if (targetBean == null) - { - try - { - Class epImpl = ep.getTargetBeanClass(); - targetBean = epImpl.newInstance(); - invCtx.setTargetBean(targetBean); - } - catch (Exception ex) - { - throw new IllegalStateException("Cannot get target bean instance", ex); - } - } - return targetBean; - } - - public void invoke(Endpoint ep, Invocation epInv) throws Exception - { - try - { - Object targetBean = getTargetBean(ep, epInv); - - InvocationContext invContext = epInv.getInvocationContext(); - WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); - if (wsContext != null) - { - ResourceInjector injector = resourceInjectorFactory.newResourceInjector(); - injector.inject(targetBean, wsContext); - } - - Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod()); - Object retObj = method.invoke(targetBean, epInv.getArgs()); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } - - protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException - { - String methodName = seiMethod.getName(); - Class[] paramTypes = seiMethod.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) - { - Class paramType = paramTypes[i]; - if (JavaUtils.isPrimitive(paramType) == false) - { - String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); - paramTypes[i] = paramType; - } - } - - Method implMethod = implClass.getMethod(methodName, paramTypes); - return implMethod; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,128 @@ +/* + * 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.invocation; + +// $Id$ + +import java.lang.reflect.Method; + +import javax.xml.ws.WebServiceContext; + +import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +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.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.ResourceInjector; +import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerJSE extends InvocationHandler +{ + private SPIProvider spiProvider; + private ResourceInjectorFactory resourceInjectorFactory; + + public InvocationHandlerJSE() + { + spiProvider = SPIProviderResolver.getInstance().getProvider(); + resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class); + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + } + + protected Object getTargetBean(Endpoint ep, Invocation epInv) + { + InvocationContext invCtx = epInv.getInvocationContext(); + Object targetBean = invCtx.getTargetBean(); + if (targetBean == null) + { + try + { + Class epImpl = ep.getTargetBeanClass(); + targetBean = epImpl.newInstance(); + invCtx.setTargetBean(targetBean); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot get target bean instance", ex); + } + } + return targetBean; + } + + public void invoke(Endpoint ep, Invocation epInv) throws Exception + { + try + { + Object targetBean = getTargetBean(ep, epInv); + + InvocationContext invContext = epInv.getInvocationContext(); + WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); + if (wsContext != null) + { + ResourceInjector injector = resourceInjectorFactory.newResourceInjector(); + injector.inject(targetBean, wsContext); + } + + Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod()); + Object retObj = method.invoke(targetBean, epInv.getArgs()); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } + + protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException + { + String methodName = seiMethod.getName(); + Class[] paramTypes = seiMethod.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) + { + Class paramType = paramTypes[i]; + if (JavaUtils.isPrimitive(paramType) == false) + { + String paramTypeName = paramType.getName(); + paramType = JavaUtils.loadJavaType(paramTypeName); + paramTypes[i] = paramType; + } + } + + Method implMethod = implClass.getMethod(methodName, paramTypes); + return implMethod; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,88 +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.container.jboss50.invocation; - -// $Id$ - -import java.lang.reflect.Method; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; - -/** - * Handles invocations on MDB EJB21 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerMDB21 extends AbstractInvocationHandler -{ - // 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()); - - try - { - InvocationContext invCtx = epInv.getInvocationContext(); - Object targetBean = invCtx.getTargetBean(); - if (targetBean == null) - { - try - { - Class epImpl = ep.getTargetBeanClass(); - targetBean = epImpl.newInstance(); - invCtx.setTargetBean(targetBean); - } - catch (Exception ex) - { - throw new IllegalStateException("Canot get target bean instance", ex); - } - } - Class implClass = targetBean.getClass(); - Method seiMethod = epInv.getJavaMethod(); - Method implMethod = getImplMethod(implClass, seiMethod); - - Object[] args = epInv.getArgs(); - Object retObj = implMethod.invoke(targetBean, args); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,88 @@ +/* + * 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.invocation; + +// $Id$ + +import java.lang.reflect.Method; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationContext; + +/** + * Handles invocations on MDB EJB21 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerMDB21 extends AbstractInvocationHandler +{ + // 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()); + + try + { + InvocationContext invCtx = epInv.getInvocationContext(); + Object targetBean = invCtx.getTargetBean(); + if (targetBean == null) + { + try + { + Class epImpl = ep.getTargetBeanClass(); + targetBean = epImpl.newInstance(); + invCtx.setTargetBean(targetBean); + } + catch (Exception ex) + { + throw new IllegalStateException("Canot get target bean instance", ex); + } + } + Class implClass = targetBean.getClass(); + Method seiMethod = epInv.getJavaMethod(); + Method implMethod = getImplMethod(implClass, seiMethod); + + Object[] args = epInv.getArgs(); + Object retObj = implMethod.invoke(targetBean, args); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,88 +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.container.jboss50.invocation; - -// $Id$ - -import java.lang.reflect.Method; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; - -/** - * Handles invocations on MDB EJB3 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerMDB3 extends AbstractInvocationHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(InvocationHandlerMDB3.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()); - - try - { - InvocationContext invCtx = epInv.getInvocationContext(); - Object targetBean = invCtx.getTargetBean(); - if (targetBean == null) - { - try - { - Class epImpl = ep.getTargetBeanClass(); - targetBean = epImpl.newInstance(); - invCtx.setTargetBean(targetBean); - } - catch (Exception ex) - { - throw new IllegalStateException("Canot get target bean instance", ex); - } - } - Class implClass = targetBean.getClass(); - Method seiMethod = epInv.getJavaMethod(); - Method implMethod = getImplMethod(implClass, seiMethod); - - Object[] args = epInv.getArgs(); - Object retObj = implMethod.invoke(targetBean, args); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,88 @@ +/* + * 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.invocation; + +// $Id$ + +import java.lang.reflect.Method; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationContext; + +/** + * Handles invocations on MDB EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerMDB3 extends AbstractInvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerMDB3.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()); + + try + { + InvocationContext invCtx = epInv.getInvocationContext(); + Object targetBean = invCtx.getTargetBean(); + if (targetBean == null) + { + try + { + Class epImpl = ep.getTargetBeanClass(); + targetBean = epImpl.newInstance(); + invCtx.setTargetBean(targetBean); + } + catch (Exception ex) + { + throw new IllegalStateException("Canot get target bean instance", ex); + } + } + Class implClass = targetBean.getClass(); + Method seiMethod = epInv.getJavaMethod(); + Method implMethod = getImplMethod(implClass, seiMethod); + + Object[] args = epInv.getArgs(); + Object retObj = implMethod.invoke(targetBean, args); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,37 +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.container.jboss50.invocation; - -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 24, 2007 - */ -public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory -{ - public SecurityAdaptor newSecurityAdapter() - { - return new SecurityAdaptorImpl(); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.invocation; + +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory +{ + public SecurityAdaptor newSecurityAdapter() + { + return new SecurityAdaptorImpl(); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,62 +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.container.jboss50.invocation; - -// $Id$ - -import org.jboss.security.SecurityAssociation; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; - -import java.security.Principal; - -/** - * A JBoss specific SecurityAssociationAdaptor - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class SecurityAdaptorImpl implements SecurityAdaptor -{ - SecurityAdaptorImpl() - { - } - - public Principal getPrincipal() - { - return SecurityAssociation.getPrincipal(); - } - - public void setPrincipal(Principal pricipal) - { - SecurityAssociation.setPrincipal(pricipal); - } - - public Object getCredential() - { - return SecurityAssociation.getCredential(); - } - - public void setCredential(Object credential) - { - SecurityAssociation.setCredential(credential); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,62 @@ +/* + * 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.invocation; + +// $Id$ + +import org.jboss.security.SecurityAssociation; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; + +import java.security.Principal; + +/** + * A JBoss specific SecurityAssociationAdaptor + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class SecurityAdaptorImpl implements SecurityAdaptor +{ + SecurityAdaptorImpl() + { + } + + public Principal getPrincipal() + { + return SecurityAssociation.getPrincipal(); + } + + public void setPrincipal(Principal pricipal) + { + SecurityAssociation.setPrincipal(pricipal); + } + + public Object getCredential() + { + return SecurityAssociation.getCredential(); + } + + public void setCredential(Object credential) + { + SecurityAssociation.setCredential(credential); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,126 +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.container.jboss50.invocation; - -// $Id$ - -import org.jboss.ejb.plugins.AbstractInterceptor; -import org.jboss.invocation.InvocationKey; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.invocation.HandlerCallback; -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. - * - * According to the ws4ee spec the handler logic must be invoked after the container - * applied method level security to the invocation. - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Sep-2005 - */ -public class ServiceEndpointInterceptor extends AbstractInterceptor -{ - // provide logging - private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class); - - // Interceptor implementation -------------------------------------- - - /** Before and after we call the service endpoint bean, we process the handler chains. - */ - public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception - { - // If no msgContext, it's not for us - SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); - if (msgContext == null) - { - return getNext().invoke(jbInv); - } - - // Get the endpoint invocation - Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName()); - - // Get the handler callback - HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName()); - - // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. - if (callback != null && wsInv != null) - { - try - { - // call the request handlers - boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT); - handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST); - - // Call the next interceptor in the chain - if (handlersPass) - { - // The SOAPContentElements stored in the EndpointInvocation might have changed after - // handler processing. Get the updated request payload. This should be a noop if request - // handlers did not modify the incomming SOAP message. - Object[] reqParams = wsInv.getArgs(); - jbInv.setArguments(reqParams); - Object resObj = getNext().invoke(jbInv); - - // Setting the message to null should trigger binding of the response message - msgContext.setMessage(null); - wsInv.setReturnValue(resObj); - } - - // call the response handlers - handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST); - handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT); - - // update the return value after response handler processing - Object resObj = wsInv.getReturnValue(); - - return resObj; - } - catch (Exception ex) - { - try - { - // call the fault handlers - boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex); - handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex); - } - catch (Exception subEx) - { - log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); - } - throw ex; - } - finally - { - // do nothing - } - } - else - { - log.warn("Handler callback not available"); - return getNext().invoke(jbInv); - } - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,126 @@ +/* + * 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.invocation; + +// $Id$ + +import org.jboss.ejb.plugins.AbstractInterceptor; +import org.jboss.invocation.InvocationKey; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.invocation.HandlerCallback; +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. + * + * According to the ws4ee spec the handler logic must be invoked after the container + * applied method level security to the invocation. + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Sep-2005 + */ +public class ServiceEndpointInterceptor extends AbstractInterceptor +{ + // provide logging + private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class); + + // Interceptor implementation -------------------------------------- + + /** Before and after we call the service endpoint bean, we process the handler chains. + */ + public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception + { + // If no msgContext, it's not for us + SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); + if (msgContext == null) + { + return getNext().invoke(jbInv); + } + + // Get the endpoint invocation + Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName()); + + // Get the handler callback + HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName()); + + // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. + if (callback != null && wsInv != null) + { + try + { + // call the request handlers + boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT); + handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST); + + // Call the next interceptor in the chain + if (handlersPass) + { + // The SOAPContentElements stored in the EndpointInvocation might have changed after + // handler processing. Get the updated request payload. This should be a noop if request + // handlers did not modify the incomming SOAP message. + Object[] reqParams = wsInv.getArgs(); + jbInv.setArguments(reqParams); + Object resObj = getNext().invoke(jbInv); + + // Setting the message to null should trigger binding of the response message + msgContext.setMessage(null); + wsInv.setReturnValue(resObj); + } + + // call the response handlers + handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST); + handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT); + + // update the return value after response handler processing + Object resObj = wsInv.getReturnValue(); + + return resObj; + } + catch (Exception ex) + { + try + { + // call the fault handlers + boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex); + handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex); + } + catch (Exception subEx) + { + log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); + } + throw ex; + } + finally + { + // do nothing + } + } + else + { + log.warn("Handler callback not available"); + return getNext().invoke(jbInv); + } + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,45 +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.container.jboss50.invocation; - -import org.jboss.wsf.spi.invocation.*; - -import javax.xml.ws.handler.MessageContext; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 25, 2007 - */ -public class WebServiceContextFactoryImpl extends WebServiceContextFactory -{ - public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtensibleWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,45 @@ +/* + * 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.invocation; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtensibleWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.transport; - -import org.jboss.wsf.spi.transport.TransportManagerFactory; -import org.jboss.wsf.spi.transport.TransportManager; -import org.jboss.wsf.spi.transport.Protocol; - -/** - * Used with MC - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class BareTransportManagerFactory implements TransportManagerFactory -{ - - private TransportManager httpTransport; - - - public void setHttpTransport(TransportManager httpTransport) - { - this.httpTransport = httpTransport; - } - - public TransportManager createTransportManager(Protocol protocol) - { - TransportManager manager = null; - - switch(protocol) - { - case HTTP: - manager = httpTransport; - break; - default: - throw new IllegalArgumentException("No TransportManager for protocol: " + protocol); - } - - return manager; - } -} - Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport; + +import org.jboss.wsf.spi.transport.TransportManagerFactory; +import org.jboss.wsf.spi.transport.TransportManager; +import org.jboss.wsf.spi.transport.Protocol; + +/** + * Used with MC + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class BareTransportManagerFactory implements TransportManagerFactory +{ + + private TransportManager httpTransport; + + + public void setHttpTransport(TransportManager httpTransport) + { + this.httpTransport = httpTransport; + } + + public TransportManager createTransportManager(Protocol protocol) + { + TransportManager manager = null; + + switch(protocol) + { + case HTTP: + manager = httpTransport; + break; + default: + throw new IllegalArgumentException("No TransportManager for protocol: " + protocol); + } + + return manager; + } +} + Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,141 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.transport; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.transport.HttpListenerRef; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.transport.HttpSpec; -import org.jboss.wsf.spi.transport.ListenerRef; -import org.jboss.wsf.spi.transport.TransportManager; -import org.jboss.wsf.spi.transport.TransportSpec; - -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 - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class EJBHttpTransportManager implements TransportManager -{ - private static Logger log = Logger.getLogger(EJBHttpTransportManager.class); - private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; - 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; - - // 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 - Deployment topLevelDeployment = endpoint.getService().getDeployment(); - - // TODO: Somehow the ServletClass and InitParameter need to go from TransportSpec into generator - topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS, httpSpec.getServletClass()); - topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS, httpSpec.getContextParameter()); - - // TODO: JBWS-2188 - Boolean alreadyDeployed = (Boolean)topLevelDeployment.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - if ((alreadyDeployed == null) || (false == alreadyDeployed)) - { - URL webAppURL = generator.create(topLevelDeployment); - deploymentFactory.create(topLevelDeployment, webAppURL); - topLevelDeployment.setProperty(PROCESSED_BY_DEPLOYMENT_FACTORY, Boolean.TRUE); - } - - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); - ServerConfig serverConfig = spi.getServerConfig(); - - String host = serverConfig.getWebServiceHost(); - int port = serverConfig.getWebServicePort(); - String hostAndPort = host + (port > 0 ? ":" + port : ""); - - ListenerRef listenerRef = null; - try - { - String ctx = httpSpec.getWebContext(); - String pattern = httpSpec.getUrlPattern(); - 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) - { - Deployment dep = deploymentRegistry.get(ref.getUUID()); - if (dep != null) - { - // TODO: JBWS-2188 - Boolean alreadyDeployed = (Boolean)dep.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - if ((alreadyDeployed != null) && (true == alreadyDeployed)) - { - try - { - deploymentFactory.destroy(dep); - } - catch (Exception e) - { - log.error(e.getMessage(), e); - } - dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - } - } - deploymentRegistry.remove(ref.getUUID()); - } - - public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) - { - this.deploymentFactory = deploymentFactory; - } - - public void setGenerator(WebAppGenerator generator) - { - this.generator = generator; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,141 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.transport.HttpListenerRef; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.transport.HttpSpec; +import org.jboss.wsf.spi.transport.ListenerRef; +import org.jboss.wsf.spi.transport.TransportManager; +import org.jboss.wsf.spi.transport.TransportSpec; + +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 + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class EJBHttpTransportManager implements TransportManager +{ + private static Logger log = Logger.getLogger(EJBHttpTransportManager.class); + private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; + 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; + + // 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 + Deployment topLevelDeployment = endpoint.getService().getDeployment(); + + // TODO: Somehow the ServletClass and InitParameter need to go from TransportSpec into generator + topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS, httpSpec.getServletClass()); + topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS, httpSpec.getContextParameter()); + + // TODO: JBWS-2188 + Boolean alreadyDeployed = (Boolean)topLevelDeployment.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + if ((alreadyDeployed == null) || (false == alreadyDeployed)) + { + URL webAppURL = generator.create(topLevelDeployment); + deploymentFactory.create(topLevelDeployment, webAppURL); + topLevelDeployment.setProperty(PROCESSED_BY_DEPLOYMENT_FACTORY, Boolean.TRUE); + } + + SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); + ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); + ServerConfig serverConfig = spi.getServerConfig(); + + String host = serverConfig.getWebServiceHost(); + int port = serverConfig.getWebServicePort(); + String hostAndPort = host + (port > 0 ? ":" + port : ""); + + ListenerRef listenerRef = null; + try + { + String ctx = httpSpec.getWebContext(); + String pattern = httpSpec.getUrlPattern(); + 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) + { + Deployment dep = deploymentRegistry.get(ref.getUUID()); + if (dep != null) + { + // TODO: JBWS-2188 + Boolean alreadyDeployed = (Boolean)dep.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + if ((alreadyDeployed != null) && (true == alreadyDeployed)) + { + try + { + deploymentFactory.destroy(dep); + } + catch (Exception e) + { + log.error(e.getMessage(), e); + } + dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + } + } + deploymentRegistry.remove(ref.getUUID()); + } + + public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) + { + this.deploymentFactory = deploymentFactory; + } + + public void setGenerator(WebAppGenerator generator) + { + this.generator = generator; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,133 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.transport; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.transport.HttpListenerRef; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.transport.HttpSpec; -import org.jboss.wsf.spi.transport.ListenerRef; -import org.jboss.wsf.spi.transport.TransportManager; -import org.jboss.wsf.spi.transport.TransportSpec; - -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Map; -import java.util.HashMap; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class EndpointAPIHttpTransportManager implements TransportManager -{ - private static Logger log = Logger.getLogger(EndpointAPIHttpTransportManager.class); - private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; - private WebAppDeploymentFactory deploymentFactory; - private WebAppGenerator generator; - private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>(); - - public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) - { - assert generator!=null; - - // Resolve the endpoint address - if(! (transportSpec instanceof HttpSpec)) - throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec); - HttpSpec httpSpec = (HttpSpec)transportSpec; - - // Create jboss web app data and attach it to the Deployment - Deployment topLevelDeployment = endpoint.getService().getDeployment(); - - // TODO: JBWS-2188 - Boolean alreadyDeployed = (Boolean)topLevelDeployment.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - if ((alreadyDeployed == null) || (false == alreadyDeployed)) - { - URL webAppURL = generator.create(topLevelDeployment); - deploymentFactory.create(topLevelDeployment, webAppURL); - topLevelDeployment.setProperty(PROCESSED_BY_DEPLOYMENT_FACTORY, Boolean.TRUE); - } - - // Server config - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); - ServerConfig serverConfig = spi.getServerConfig(); - String host = serverConfig.getWebServiceHost(); - int port = serverConfig.getWebServicePort(); - String hostAndPort = host + (port > 0 ? ":" + port : ""); - - ListenerRef listenerRef = null; - try - { - String ctx = httpSpec.getWebContext(); - String pattern = httpSpec.getUrlPattern(); - 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) - { - Deployment dep = deploymentRegistry.get(ref.getUUID()); - if (dep != null) - { - // TODO: JBWS-2188 - Boolean alreadyDeployed = (Boolean)dep.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - if ((alreadyDeployed != null) && (true == alreadyDeployed)) - { - try - { - deploymentFactory.destroy(dep); - } - catch (Exception e) - { - log.error(e.getMessage(), e); - } - dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); - } - } - deploymentRegistry.remove(ref.getUUID()); - } - - public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) - { - this.deploymentFactory = deploymentFactory; - } - - public void setGenerator(WebAppGenerator generator) - { - this.generator = generator; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.transport.HttpListenerRef; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.transport.HttpSpec; +import org.jboss.wsf.spi.transport.ListenerRef; +import org.jboss.wsf.spi.transport.TransportManager; +import org.jboss.wsf.spi.transport.TransportSpec; + +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Map; +import java.util.HashMap; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class EndpointAPIHttpTransportManager implements TransportManager +{ + private static Logger log = Logger.getLogger(EndpointAPIHttpTransportManager.class); + private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; + private WebAppDeploymentFactory deploymentFactory; + private WebAppGenerator generator; + private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>(); + + public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) + { + assert generator!=null; + + // Resolve the endpoint address + if(! (transportSpec instanceof HttpSpec)) + throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec); + HttpSpec httpSpec = (HttpSpec)transportSpec; + + // Create jboss web app data and attach it to the Deployment + Deployment topLevelDeployment = endpoint.getService().getDeployment(); + + // TODO: JBWS-2188 + Boolean alreadyDeployed = (Boolean)topLevelDeployment.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + if ((alreadyDeployed == null) || (false == alreadyDeployed)) + { + URL webAppURL = generator.create(topLevelDeployment); + deploymentFactory.create(topLevelDeployment, webAppURL); + topLevelDeployment.setProperty(PROCESSED_BY_DEPLOYMENT_FACTORY, Boolean.TRUE); + } + + // Server config + SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); + ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); + ServerConfig serverConfig = spi.getServerConfig(); + String host = serverConfig.getWebServiceHost(); + int port = serverConfig.getWebServicePort(); + String hostAndPort = host + (port > 0 ? ":" + port : ""); + + ListenerRef listenerRef = null; + try + { + String ctx = httpSpec.getWebContext(); + String pattern = httpSpec.getUrlPattern(); + 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) + { + Deployment dep = deploymentRegistry.get(ref.getUUID()); + if (dep != null) + { + // TODO: JBWS-2188 + Boolean alreadyDeployed = (Boolean)dep.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + if ((alreadyDeployed != null) && (true == alreadyDeployed)) + { + try + { + deploymentFactory.destroy(dep); + } + catch (Exception e) + { + log.error(e.getMessage(), e); + } + dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); + } + } + deploymentRegistry.remove(ref.getUUID()); + } + + public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) + { + this.deploymentFactory = deploymentFactory; + } + + public void setGenerator(WebAppGenerator generator) + { + this.generator = generator; + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.transport; - -import org.jboss.wsf.spi.transport.HttpListenerRef; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.transport.HttpSpec; -import org.jboss.wsf.spi.transport.ListenerRef; -import org.jboss.wsf.spi.transport.TransportManager; -import org.jboss.wsf.spi.transport.TransportSpec; - -import java.net.URI; -import java.net.URISyntaxException; - -/** - * TransportManager implementation that doesn't create physical - * endpoints (ports, etc) but simply constructs a service endpoint address for a given - * deployment; - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class NoopHttpTransportManager implements TransportManager -{ - public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) - { - if(! (transportSpec instanceof HttpSpec)) - throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec); - - HttpSpec httpSpec = (HttpSpec)transportSpec; - - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); - ServerConfig serverConfig = spi.getServerConfig(); - - String host = serverConfig.getWebServiceHost(); - int port = serverConfig.getWebServicePort(); - String hostAndPort = host + (port > 0 ? ":" + port : ""); - - 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) - { - throw new RuntimeException("Failed to create ListenerRef", e); - } - } - - public void destroyListener(ListenerRef ref) - { - // noop - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport; + +import org.jboss.wsf.spi.transport.HttpListenerRef; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.transport.HttpSpec; +import org.jboss.wsf.spi.transport.ListenerRef; +import org.jboss.wsf.spi.transport.TransportManager; +import org.jboss.wsf.spi.transport.TransportSpec; + +import java.net.URI; +import java.net.URISyntaxException; + +/** + * TransportManager implementation that doesn't create physical + * endpoints (ports, etc) but simply constructs a service endpoint address for a given + * deployment; + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class NoopHttpTransportManager implements TransportManager +{ + public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec) + { + if(! (transportSpec instanceof HttpSpec)) + throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec); + + HttpSpec httpSpec = (HttpSpec)transportSpec; + + SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); + ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); + ServerConfig serverConfig = spi.getServerConfig(); + + String host = serverConfig.getWebServiceHost(); + int port = serverConfig.getWebServicePort(); + String hostAndPort = host + (port > 0 ? ":" + port : ""); + + 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) + { + throw new RuntimeException("Failed to create ListenerRef", e); + } + } + + public void destroyListener(ListenerRef ref) + { + // noop + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,134 +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.container.jboss50.transport; - -//$Id$ - -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.WSFRuntimeLocator; -import org.jboss.wsf.spi.deployment.AbstractExtensible; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.http.HttpContext; -import org.jboss.wsf.spi.http.HttpContextFactory; -import org.jboss.wsf.spi.http.HttpServer; - -import javax.xml.ws.Endpoint; -import javax.xml.ws.WebServiceException; - -/** - * A HTTP Server that uses DeploymentAspects - * - * @author Thomas.Diesler(a)jboss.org - * @since 07-Jul-2006 - */ -public class WSFRuntimeDelegateHttpServer extends AbstractExtensible implements HttpServer -{ - /** Start an instance of this HTTP server */ - public void start() - { - // verify required properties - } - - /** Create an HTTP context */ - public HttpContext createContext(String contextRoot) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot); - return httpContext; - } - - /** Publish an JAXWS endpoint to the HTTP server */ - public void publish(HttpContext context, Endpoint endpoint) - { - Class implClass = getImplementorClass(endpoint); - - try - { - // Get the deployment model factory - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class); - WSFRuntime runtime = locator.locateRuntime("EndpointAPIRuntime"); - - DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - - // Create/Setup the deployment - Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader()); - dep.setType(Deployment.DeploymentType.JAXWS_JSE); - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - - // TODO: Hack, should this become another DeploymentAspect? - ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter()); - - // Create/Setup the service - Service service = dep.getService(); - service.setContextRoot(context.getContextRoot()); - - // Create/Setup the endpoint - org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName()); - ep.setShortName(implClass.getName()+"-Endpoint"); - ep.setURLPattern("/*"); - service.addEndpoint(ep); - - // Deploy using deployment aspects - runtime.create(dep); - runtime.start(dep); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WebServiceException(ex); - } - } - - /** Destroys an JAXWS endpoint on the HTTP server */ - public void destroy(HttpContext context, Endpoint endpoint) - { - try - { - - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WebServiceException(ex); - } - } - - private Class getImplementorClass(Endpoint endpoint) - { - Object implementor = endpoint.getImplementor(); - Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass()); - return implClass; - } -} \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,134 @@ +/* + * 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.transport; + +//$Id$ + +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.WSFRuntimeLocator; +import org.jboss.wsf.spi.deployment.AbstractExtensible; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.http.HttpContext; +import org.jboss.wsf.spi.http.HttpContextFactory; +import org.jboss.wsf.spi.http.HttpServer; + +import javax.xml.ws.Endpoint; +import javax.xml.ws.WebServiceException; + +/** + * A HTTP Server that uses DeploymentAspects + * + * @author Thomas.Diesler(a)jboss.org + * @since 07-Jul-2006 + */ +public class WSFRuntimeDelegateHttpServer extends AbstractExtensible implements HttpServer +{ + /** Start an instance of this HTTP server */ + public void start() + { + // verify required properties + } + + /** Create an HTTP context */ + public HttpContext createContext(String contextRoot) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot); + return httpContext; + } + + /** Publish an JAXWS endpoint to the HTTP server */ + public void publish(HttpContext context, Endpoint endpoint) + { + Class implClass = getImplementorClass(endpoint); + + try + { + // Get the deployment model factory + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class); + WSFRuntime runtime = locator.locateRuntime("EndpointAPIRuntime"); + + DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + + // Create/Setup the deployment + Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader()); + dep.setType(Deployment.DeploymentType.JAXWS_JSE); + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + + // TODO: Hack, should this become another DeploymentAspect? + ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter()); + + // Create/Setup the service + Service service = dep.getService(); + service.setContextRoot(context.getContextRoot()); + + // Create/Setup the endpoint + org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName()); + ep.setShortName(implClass.getName()+"-Endpoint"); + ep.setURLPattern("/*"); + service.addEndpoint(ep); + + // Deploy using deployment aspects + runtime.create(dep); + runtime.start(dep); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WebServiceException(ex); + } + } + + /** Destroys an JAXWS endpoint on the HTTP server */ + public void destroy(HttpContext context, Endpoint endpoint) + { + try + { + + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WebServiceException(ex); + } + } + + private Class getImplementorClass(Endpoint endpoint) + { + Object implementor = endpoint.getImplementor(); + Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass()); + return implClass; + } +} \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,122 +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.container.jboss50.transport; - -// $Id$ - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.jboss.deployers.client.spi.DeployerClient; -import org.jboss.deployers.spi.attachments.MutableAttachments; -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.container.jboss50.deployment.tomcat.WebXMLRewriterImpl; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.transport.HttpSpec; - -/** - * Publish the HTTP service endpoint to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class WebAppDeploymentFactory -{ - // provide logging - private static Logger log = Logger.getLogger(WebAppDeploymentFactory.class); - - private DeployerClient mainDeployer; - private WebXMLRewriterImpl webXMLRewriter; - private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>(); - - public void setMainDeployer(DeployerClient mainDeployer) - { - this.mainDeployer = mainDeployer; - } - - public void setWebXMLRewriter(WebXMLRewriterImpl webXMLRewriter) - { - this.webXMLRewriter = webXMLRewriter; - } - - public void create(Deployment dep, URL webAppURL) - { - if (webAppURL == null) - throw new IllegalArgumentException("Web meta data URL cannot be null"); - - log.debug("publishServiceEndpoint: " + webAppURL); - try - { - webXMLRewriter.rewriteWebXml(dep); - dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webAppURL); - org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(webAppURL); - - // Mark the deployment as generated web app so the JSE deployer hook can ignore it - MutableAttachments attach = (MutableAttachments)deployment.getPredeterminedManagedObjects(); - attach.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE); - - mainDeployer.deploy(deployment); - - deploymentMap.put(webAppURL.toExternalForm(), deployment); - } - catch (Exception ex) - { - WSFDeploymentException.rethrow(ex); - } - } - - public void destroy(Deployment dep) - { - URL warURL = (URL)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_URL); - if (warURL == null) - { - log.error("Cannot obtain generated webapp URL"); - return; - } - - log.debug("destroyServiceEndpoint: " + warURL); - try - { - org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm()); - if (deployment != null) - { - mainDeployer.undeploy(deployment); - deploymentMap.remove(warURL.toExternalForm()); - } - } - catch (Exception ex) - { - WSFDeploymentException.rethrow(ex); - } - } - - private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception - { - VirtualFile file = VFS.getRoot(warURL); - return VFSDeploymentFactory.getInstance().createVFSDeployment(file); - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -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.container.jboss50.transport; + +// $Id$ + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.jboss.deployers.client.spi.DeployerClient; +import org.jboss.deployers.spi.attachments.MutableAttachments; +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.container.jboss50.deployment.tomcat.WebXMLRewriterImpl; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.transport.HttpSpec; + +/** + * Publish the HTTP service endpoint to Tomcat + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class WebAppDeploymentFactory +{ + // provide logging + private static Logger log = Logger.getLogger(WebAppDeploymentFactory.class); + + private DeployerClient mainDeployer; + private WebXMLRewriterImpl webXMLRewriter; + private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>(); + + public void setMainDeployer(DeployerClient mainDeployer) + { + this.mainDeployer = mainDeployer; + } + + public void setWebXMLRewriter(WebXMLRewriterImpl webXMLRewriter) + { + this.webXMLRewriter = webXMLRewriter; + } + + public void create(Deployment dep, URL webAppURL) + { + if (webAppURL == null) + throw new IllegalArgumentException("Web meta data URL cannot be null"); + + log.debug("publishServiceEndpoint: " + webAppURL); + try + { + webXMLRewriter.rewriteWebXml(dep); + dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webAppURL); + org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(webAppURL); + + // Mark the deployment as generated web app so the JSE deployer hook can ignore it + MutableAttachments attach = (MutableAttachments)deployment.getPredeterminedManagedObjects(); + attach.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE); + + mainDeployer.deploy(deployment); + + deploymentMap.put(webAppURL.toExternalForm(), deployment); + } + catch (Exception ex) + { + WSFDeploymentException.rethrow(ex); + } + } + + public void destroy(Deployment dep) + { + URL warURL = (URL)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_URL); + if (warURL == null) + { + log.error("Cannot obtain generated webapp URL"); + return; + } + + log.debug("destroyServiceEndpoint: " + warURL); + try + { + org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm()); + if (deployment != null) + { + mainDeployer.undeploy(deployment); + deploymentMap.remove(warURL.toExternalForm()); + } + } + catch (Exception ex) + { + WSFDeploymentException.rethrow(ex); + } + } + + private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception + { + VirtualFile file = VFS.getRoot(warURL); + return VFSDeploymentFactory.getInstance().createVFSDeployment(file); + } +} Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,280 +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.container.jboss50.transport; - -import org.dom4j.Document; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.XMLWriter; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; - -/** - * A deployer that generates a webapp for an EJB endpoint - * - * @author Thomas.Diesler(a)jboss.org - * - * @since 25-Apr-2007 - */ -public class WebAppGenerator -{ - private SecurityHandler securityHandlerEJB21; - private SecurityHandler securityHandlerEJB3; - - public void setSecurityHandlerEJB21(SecurityHandler handler) - { - this.securityHandlerEJB21 = handler; - } - - public void setSecurityHandlerEJB3(SecurityHandler handler) - { - this.securityHandlerEJB3 = handler; - } - - public URL create(Deployment dep) - { - String typeStr = dep.getType().toString(); - URL webAppURL = null; - if (typeStr.endsWith("EJB21")) - { - webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); - dep.setProperty("org.jboss.ws.webapp.url", webAppURL); - } - else if (typeStr.endsWith("EJB3")) - { - webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); - dep.setProperty("org.jboss.ws.webapp.url", webAppURL); - } - else - { - webAppURL = generatWebDeployment((ArchiveDeployment)dep, null); - dep.setProperty("org.jboss.ws.webapp.url", webAppURL); - } - - return webAppURL; - } - - protected URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler) - { - Document webDoc = createWebAppDescriptor(dep, securityHandler); - Document jbossDoc = createJBossWebAppDescriptor(dep, securityHandler); - - File tmpWar = null; - try - { - // TODO: recursive dependency, ohoh - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); - - String deploymentName = dep.getCanonicalName().replace('/', '-'); - tmpWar = File.createTempFile(deploymentName, ".war", tmpdir); - tmpWar.delete(); - - File webInf = new File(tmpWar, "WEB-INF"); - webInf.mkdirs(); - - File webXml = new File(webInf, "web.xml"); - FileWriter fw = new FileWriter(webXml); - OutputFormat format = OutputFormat.createPrettyPrint(); - XMLWriter writer = new XMLWriter(fw, format); - writer.write(webDoc); - writer.close(); - - File jbossWebXml = new File(webInf, "jboss-web.xml"); - fw = new FileWriter(jbossWebXml); - writer = new XMLWriter(fw, format); - writer.write(jbossDoc); - writer.close(); - - return tmpWar.toURL(); - } - catch (IOException e) - { - throw new WSFDeploymentException("Failed to create webservice.war", e); - } - } - - protected Document createWebAppDescriptor(Deployment dep, SecurityHandler securityHandler) - { - Document document = DocumentHelper.createDocument(); - Element webApp = document.addElement("web-app"); - - /* - <servlet> - <servlet-name> - <servlet-class> - </servlet> - */ - for (Endpoint ep : dep.getService().getEndpoints()) - { - Element servlet = webApp.addElement("servlet"); - servlet.addElement("servlet-name").addText(ep.getShortName()); - servlet.addElement("servlet-class").addText(ep.getTargetBeanName()); - } - - /* - <servlet-mapping> - <servlet-name> - <url-pattern> - </servlet-mapping> - */ - ArrayList urlPatters = new ArrayList(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - Element servletMapping = webApp.addElement("servlet-mapping"); - servletMapping.addElement("servlet-name").addText(ep.getShortName()); - servletMapping.addElement("url-pattern").addText(ep.getURLPattern()); - } - - String authMethod = null; - - // Add web-app/security-constraint for each port component - for (Endpoint ep : dep.getService().getEndpoints()) - { - String ejbName = ep.getShortName(); - - Boolean secureWSDLAccess = null; - String transportGuarantee = null; - String beanAuthMethod = null; - - WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class); - if (anWebContext != null) - { - if (anWebContext.authMethod().length() > 0) - beanAuthMethod = anWebContext.authMethod(); - if (anWebContext.transportGuarantee().length() > 0) - transportGuarantee = anWebContext.transportGuarantee(); - if (anWebContext.secureWSDLAccess()) - secureWSDLAccess = anWebContext.secureWSDLAccess(); - } - - EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); - if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null) - { - EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName); - EJBSecurityMetaData smd = bmd.getSecurityMetaData(); - if (smd != null) - { - beanAuthMethod = smd.getAuthMethod(); - transportGuarantee = smd.getTransportGuarantee(); - secureWSDLAccess = smd.getSecureWSDLAccess(); - } - } - - if (beanAuthMethod != null || transportGuarantee != null) - { - /* - <security-constraint> - <web-resource-collection> - <web-resource-name>TestUnAuthPort</web-resource-name> - <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>*</role-name> - </auth-constraint> - <user-data-constraint> - <transport-guarantee>NONE</transport-guarantee> - </user-data-constraint> - </security-constraint> - */ - Element securityConstraint = webApp.addElement("security-constraint"); - Element wrc = securityConstraint.addElement("web-resource-collection"); - wrc.addElement("web-resource-name").addText(ejbName); - wrc.addElement("url-pattern").addText(ep.getURLPattern()); - if (Boolean.TRUE.equals(secureWSDLAccess)) - { - wrc.addElement("http-method").addText("GET"); - } - wrc.addElement("http-method").addText("POST"); - - // Optional auth-constraint - if (beanAuthMethod != null) - { - // Only the first auth-method gives the war login-config/auth-method - if (authMethod == null) - authMethod = beanAuthMethod; - - Element authConstraint = securityConstraint.addElement("auth-constraint").addElement("role-name").addText("*"); - } - // Optional user-data-constraint - if (transportGuarantee != null) - { - Element userData = securityConstraint.addElement("user-data-constraint"); - userData.addElement("transport-guarantee").addText(transportGuarantee); - } - } - } - - // Optional login-config/auth-method - if (authMethod != null && securityHandler != null) - { - Element loginConfig = webApp.addElement("login-config"); - loginConfig.addElement("auth-method").addText(authMethod); - loginConfig.addElement("realm-name").addText("EJBServiceEndpointServlet Realm"); - - securityHandler.addSecurityRoles(webApp, dep); - } - document.addDocType("web-app", "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "http://java.sun.com/dtd/web-app_2_3.dtd"); - return document; - } - - protected Document createJBossWebAppDescriptor(Deployment dep, SecurityHandler securityHandler) - { - Document document = DocumentHelper.createDocument(); - - /* Create a jboss-web - <jboss-web> - <security-domain>java:/jaas/cts</security-domain> - <context-root>/ws/ejbN/</context-root> - <virtual-host>some.domain.com</virtual-host> - </jboss-web> - */ - Element jbossWeb = document.addElement("jboss-web"); - - if (securityHandler != null) - securityHandler.addSecurityDomain(jbossWeb, dep); - - // Get the context root for this deployment - String contextRoot = dep.getService().getContextRoot(); - if (contextRoot == null) - throw new WSFDeploymentException("Cannot obtain context root"); - - jbossWeb.addElement("context-root").addText(contextRoot); - document.addDocType("jboss-web", "-//JBoss//DTD Web Application 5.0//EN", "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"); - return document; - } -} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,280 @@ +/* + * 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.transport; + +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; + +/** + * A deployer that generates a webapp for an EJB endpoint + * + * @author Thomas.Diesler(a)jboss.org + * + * @since 25-Apr-2007 + */ +public class WebAppGenerator +{ + private SecurityHandler securityHandlerEJB21; + private SecurityHandler securityHandlerEJB3; + + public void setSecurityHandlerEJB21(SecurityHandler handler) + { + this.securityHandlerEJB21 = handler; + } + + public void setSecurityHandlerEJB3(SecurityHandler handler) + { + this.securityHandlerEJB3 = handler; + } + + public URL create(Deployment dep) + { + String typeStr = dep.getType().toString(); + URL webAppURL = null; + if (typeStr.endsWith("EJB21")) + { + webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); + } + else if (typeStr.endsWith("EJB3")) + { + webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); + } + else + { + webAppURL = generatWebDeployment((ArchiveDeployment)dep, null); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); + } + + return webAppURL; + } + + protected URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler) + { + Document webDoc = createWebAppDescriptor(dep, securityHandler); + Document jbossDoc = createJBossWebAppDescriptor(dep, securityHandler); + + File tmpWar = null; + try + { + // TODO: recursive dependency, ohoh + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); + + String deploymentName = dep.getCanonicalName().replace('/', '-'); + tmpWar = File.createTempFile(deploymentName, ".war", tmpdir); + tmpWar.delete(); + + File webInf = new File(tmpWar, "WEB-INF"); + webInf.mkdirs(); + + File webXml = new File(webInf, "web.xml"); + FileWriter fw = new FileWriter(webXml); + OutputFormat format = OutputFormat.createPrettyPrint(); + XMLWriter writer = new XMLWriter(fw, format); + writer.write(webDoc); + writer.close(); + + File jbossWebXml = new File(webInf, "jboss-web.xml"); + fw = new FileWriter(jbossWebXml); + writer = new XMLWriter(fw, format); + writer.write(jbossDoc); + writer.close(); + + return tmpWar.toURL(); + } + catch (IOException e) + { + throw new WSFDeploymentException("Failed to create webservice.war", e); + } + } + + protected Document createWebAppDescriptor(Deployment dep, SecurityHandler securityHandler) + { + Document document = DocumentHelper.createDocument(); + Element webApp = document.addElement("web-app"); + + /* + <servlet> + <servlet-name> + <servlet-class> + </servlet> + */ + for (Endpoint ep : dep.getService().getEndpoints()) + { + Element servlet = webApp.addElement("servlet"); + servlet.addElement("servlet-name").addText(ep.getShortName()); + servlet.addElement("servlet-class").addText(ep.getTargetBeanName()); + } + + /* + <servlet-mapping> + <servlet-name> + <url-pattern> + </servlet-mapping> + */ + ArrayList urlPatters = new ArrayList(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + Element servletMapping = webApp.addElement("servlet-mapping"); + servletMapping.addElement("servlet-name").addText(ep.getShortName()); + servletMapping.addElement("url-pattern").addText(ep.getURLPattern()); + } + + String authMethod = null; + + // Add web-app/security-constraint for each port component + for (Endpoint ep : dep.getService().getEndpoints()) + { + String ejbName = ep.getShortName(); + + Boolean secureWSDLAccess = null; + String transportGuarantee = null; + String beanAuthMethod = null; + + WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class); + if (anWebContext != null) + { + if (anWebContext.authMethod().length() > 0) + beanAuthMethod = anWebContext.authMethod(); + if (anWebContext.transportGuarantee().length() > 0) + transportGuarantee = anWebContext.transportGuarantee(); + if (anWebContext.secureWSDLAccess()) + secureWSDLAccess = anWebContext.secureWSDLAccess(); + } + + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); + if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null) + { + EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName); + EJBSecurityMetaData smd = bmd.getSecurityMetaData(); + if (smd != null) + { + beanAuthMethod = smd.getAuthMethod(); + transportGuarantee = smd.getTransportGuarantee(); + secureWSDLAccess = smd.getSecureWSDLAccess(); + } + } + + if (beanAuthMethod != null || transportGuarantee != null) + { + /* + <security-constraint> + <web-resource-collection> + <web-resource-name>TestUnAuthPort</web-resource-name> + <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>*</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> + */ + Element securityConstraint = webApp.addElement("security-constraint"); + Element wrc = securityConstraint.addElement("web-resource-collection"); + wrc.addElement("web-resource-name").addText(ejbName); + wrc.addElement("url-pattern").addText(ep.getURLPattern()); + if (Boolean.TRUE.equals(secureWSDLAccess)) + { + wrc.addElement("http-method").addText("GET"); + } + wrc.addElement("http-method").addText("POST"); + + // Optional auth-constraint + if (beanAuthMethod != null) + { + // Only the first auth-method gives the war login-config/auth-method + if (authMethod == null) + authMethod = beanAuthMethod; + + Element authConstraint = securityConstraint.addElement("auth-constraint").addElement("role-name").addText("*"); + } + // Optional user-data-constraint + if (transportGuarantee != null) + { + Element userData = securityConstraint.addElement("user-data-constraint"); + userData.addElement("transport-guarantee").addText(transportGuarantee); + } + } + } + + // Optional login-config/auth-method + if (authMethod != null && securityHandler != null) + { + Element loginConfig = webApp.addElement("login-config"); + loginConfig.addElement("auth-method").addText(authMethod); + loginConfig.addElement("realm-name").addText("EJBServiceEndpointServlet Realm"); + + securityHandler.addSecurityRoles(webApp, dep); + } + document.addDocType("web-app", "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "http://java.sun.com/dtd/web-app_2_3.dtd"); + return document; + } + + protected Document createJBossWebAppDescriptor(Deployment dep, SecurityHandler securityHandler) + { + Document document = DocumentHelper.createDocument(); + + /* Create a jboss-web + <jboss-web> + <security-domain>java:/jaas/cts</security-domain> + <context-root>/ws/ejbN/</context-root> + <virtual-host>some.domain.com</virtual-host> + </jboss-web> + */ + Element jbossWeb = document.addElement("jboss-web"); + + if (securityHandler != null) + securityHandler.addSecurityDomain(jbossWeb, dep); + + // Get the context root for this deployment + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new WSFDeploymentException("Cannot obtain context root"); + + jbossWeb.addElement("context-root").addText(contextRoot); + document.addDocType("jboss-web", "-//JBoss//DTD Web Application 5.0//EN", "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"); + return document; + } +} Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,260 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <!-- Locate the single instance of the MBeanServer --> - <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - - <!-- The HTTPServer used by the JAXWS Endpoint API --> - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.WSFRuntimeDelegateHttpServer"/> - - <!-- - ********************************************************************************************************************* - Main WSFRuntimes. - --> - - <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> - <constructor> - <parameter>WebserviceJSERuntime</parameter> - </constructor> - <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> - - <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> - <constructor> - <parameter>WebserviceEJBRuntime</parameter> - </constructor> - <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> - - <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> - <constructor> - <parameter>EndpointAPIRuntime</parameter> - </constructor> - <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> - - <!-- - ********************************************************************************************************************* - WSFRuntimes Components - --> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - - <!-- JSE transport --> - <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="JSEHttpTransport"/></property> - </bean> - - <!-- EJB transport --> - <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="EJBHttpTransport"/></property> - </bean> - - <!-- Endpoint API transport --> - <bean name="EndpointAPITransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="EndpointAPIHttpTransport"/></property> - </bean> - - <bean name="JSEHttpTransport" class="org.jboss.wsf.container.jboss50.transport.NoopHttpTransportManager"/> - - <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="deploymentFactory"><inject bean="WSWebAppDeploymentFactory"/></property> - </bean> - - <!-- Dynamically creates web apps in memory --> - <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> - - <!-- Attaches a web meta data to the deployment unit --> - <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory"> - <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> - - <!-- invcocation handling --> - <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/> - - <!-- - ********************************************************************************************************************* - Each DeploymentAspectManger maintains a list of DeploymentAspects which are installed by an AspectInstaller - --> - - <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> - - <!-- - ********************************************************************************************************************* - The container deployment aspects - --> - - <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData,VFSRoot</property> - </bean> - - <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,WebMetaData</property> - </bean> - - <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> - <property name="provides">ContainerMetaData,RuntimeLoader,URLPattern,VFSRoot</property> - </bean> - - <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">ContainerEndpointHandler</property> - </bean> - - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> - <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - </bean> - - <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,WebMetaData</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> - - <!-- - ********************************************************************************************************************* - Deployment aspect helper beans - --> - <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="WSWebAppDescriptorModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.DefaultWebAppDescriptorModifierImpl"/> - - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebXMLRewriterImpl"> - <property name="descriptorModifier"><inject bean="WSWebAppDescriptorModifier"/></property> - </bean> - - <!-- - ********************************************************************************************************************* - Deployment aspect installers - --> - - <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="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <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> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,260 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- Locate the single instance of the kernel --> + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <!-- Locate the single instance of the MBeanServer --> + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- The HTTPServer used by the JAXWS Endpoint API --> + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.WSFRuntimeDelegateHttpServer"/> + + <!-- + ********************************************************************************************************************* + Main WSFRuntimes. + --> + + <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <constructor> + <parameter>WebserviceJSERuntime</parameter> + </constructor> + <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> + + <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <constructor> + <parameter>WebserviceEJBRuntime</parameter> + </constructor> + <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> + + <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <constructor> + <parameter>EndpointAPIRuntime</parameter> + </constructor> + <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> + + <!-- + ********************************************************************************************************************* + WSFRuntimes Components + --> + + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + + <!-- JSE transport --> + <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="JSEHttpTransport"/></property> + </bean> + + <!-- EJB transport --> + <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="EJBHttpTransport"/></property> + </bean> + + <!-- Endpoint API transport --> + <bean name="EndpointAPITransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="EndpointAPIHttpTransport"/></property> + </bean> + + <bean name="JSEHttpTransport" class="org.jboss.wsf.container.jboss50.transport.NoopHttpTransportManager"/> + + <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="deploymentFactory"><inject bean="WSWebAppDeploymentFactory"/></property> + </bean> + + <!-- Dynamically creates web apps in memory --> + <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> + + <!-- Attaches a web meta data to the deployment unit --> + <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> + + <!-- invcocation handling --> + <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/> + + <!-- + ********************************************************************************************************************* + Each DeploymentAspectManger maintains a list of DeploymentAspects which are installed by an AspectInstaller + --> + + <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> + + <!-- + ********************************************************************************************************************* + The container deployment aspects + --> + + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData,VFSRoot</property> + </bean> + + <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,WebMetaData</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData,RuntimeLoader,URLPattern,VFSRoot</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <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,WebMetaData</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> + + <!-- + ********************************************************************************************************************* + Deployment aspect helper beans + --> + <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="WSWebAppDescriptorModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.DefaultWebAppDescriptorModifierImpl"/> + + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebXMLRewriterImpl"> + <property name="descriptorModifier"><inject bean="WSWebAppDescriptorModifier"/></property> + </bean> + + <!-- + ********************************************************************************************************************* + Deployment aspect installers + --> + + <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="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <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> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ********************************************************************************************************************* - Web Service deployment - - There are two deployers registered with the JBoss Main Deployer. - The order of which is important - - 1) EJBDeployer < WebServiceDeployerEJB - 2) WebServiceDeployerPreJSE < WarDeployer - 3) WarDeployer < WebServiceDeployerPostJSE - - Each WebServiceDeployer has a number of DeployerHooks registered with it - - - WebServiceDeployerEJB - - WSDeployerHook_JAXRPC_EJB21 - - WSDeployerHook_JAXWS_EJB3 - - - WebServiceDeployerPreJSE - - WSDeployerHook_JAXRPC_JSE - - WSDeployerHook_JAXWS_JSE - - Conceptually, each of these hooks implements the following pattern: - - DeployerHook.deploy(unit) - if(isWebServiceDeployment) - Deployment dep = createDeployment(unit) - DeploymentAspectManager.deploy(dep) - - DeployerHook.undeploy(unit) - Deployment dep = getDeployment(unit) - DeploymentAspectManager.undeploy(dep) - - 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. - - Finally, each Endpoint is registered with the EndpointRegistry. - - ********************************************************************************************************************* - --> - - <!-- - A web service deployer that hooks in after the EJB deployers - --> - <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> - - <!-- - A web service deployer that hooks in before the WAR deployer - --> - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> - - <!-- - A web service deployer that hooks in after the WAR deployer - This deployer depends on the RuntimeClassloader being available. - --> - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> - - <!-- - Register DeployerHooks with JBoss deployers - --> - - <!-- Phase 1 of JSE JAX-RPC --> - <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> - <!-- Phase 2 of JSE JAX-RPC --> - <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> - - <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> - - <!-- Phase 1 of JSE JAX-WS--> - <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> - <!-- Phase 2 of JSE JAX-WS --> - <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> - - <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> - -</deployment> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ********************************************************************************************************************* + Web Service deployment + + There are two deployers registered with the JBoss Main Deployer. + The order of which is important + + 1) EJBDeployer < WebServiceDeployerEJB + 2) WebServiceDeployerPreJSE < WarDeployer + 3) WarDeployer < WebServiceDeployerPostJSE + + Each WebServiceDeployer has a number of DeployerHooks registered with it + + - WebServiceDeployerEJB + - WSDeployerHook_JAXRPC_EJB21 + - WSDeployerHook_JAXWS_EJB3 + + - WebServiceDeployerPreJSE + - WSDeployerHook_JAXRPC_JSE + - WSDeployerHook_JAXWS_JSE + + Conceptually, each of these hooks implements the following pattern: + + DeployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeploymentAspectManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeploymentAspectManager.undeploy(dep) + + 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. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + + <!-- + A web service deployer that hooks in after the EJB deployers + --> + <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> + + <!-- + A web service deployer that hooks in before the WAR deployer + --> + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> + </bean> + + <!-- + A web service deployer that hooks in after the WAR deployer + This deployer depends on the RuntimeClassloader being available. + --> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> + </bean> + + <!-- + Register DeployerHooks with JBoss deployers + --> + + <!-- Phase 1 of JSE JAX-RPC --> + <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> + <!-- Phase 2 of JSE JAX-RPC --> + <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> + + <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> + + <!-- Phase 1 of JSE JAX-WS--> + <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> + <!-- Phase 2 of JSE JAX-WS --> + <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> + + <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> + +</deployment> Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF) Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.framework.DefaultWSFRuntimeLocator \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.framework.DefaultWSFRuntimeLocator \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.invocation.SecurityAdapterFactoryImpl \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.invocation.SecurityAdapterFactoryImpl \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.invocation.WebServiceContextFactoryImpl \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.invocation.WebServiceContextFactoryImpl \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -1 +0,0 @@ -org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts) Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,14 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - <id>container</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/resources/jbossws-jboss50-container.jar</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-container.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,14 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>container</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources/jbossws-jboss50-container.jar</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Deleted: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml 2008-06-16 07:46:53 UTC (rev 7556) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -1,18 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - <id>resources</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>jbossws-jboss50.deployer/**</include> - <include>jbossws-jboss50.jar/**</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Copied: container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml (from rev 7556, container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml) =================================================================== --- container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml (rev 0) +++ container/jboss500/branches/jbossws-jboss500-3.0.2/src/main/scripts/assembly-resources.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -0,0 +1,18 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>resources</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbossws-jboss50.deployer/**</include> + <include>jbossws-jboss50.jar/**</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: container/jboss501/branches/jbossws-jboss501-3.0.2/pom.xml =================================================================== --- container/jboss501/branches/jbossws-jboss501-3.0.2/pom.xml 2008-06-16 09:17:43 UTC (rev 7588) +++ container/jboss501/branches/jbossws-jboss501-3.0.2/pom.xml 2008-06-16 09:26:56 UTC (rev 7589) @@ -6,7 +6,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2.GA</version> <!-- Parent --> <parent> @@ -24,8 +24,8 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.0.5-SNAPSHOT</jbossws.common.version> - <jbossws.spi.version>1.0.4-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>1.0.5.GA</jbossws.common.version> + <jbossws.spi.version>1.0.4.GA</jbossws.spi.version> <!-- JBoss component versions taken from