Author: richard.opalka(a)jboss.com Date: 2011-01-11 09:08:22 -0500 (Tue, 11 Jan 2011) New Revision: 13550 Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver Modified: container/jboss60/branches/jbossws-jboss600/pom.xml container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml Log: creating AS IL for AS 600.Final Modified: container/jboss60/branches/jbossws-jboss600/pom.xml =================================================================== --- container/jboss60/branches/jbossws-jboss600/pom.xml 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/pom.xml 2011-01-11 14:08:22 UTC (rev 13550) @@ -2,12 +2,12 @@ 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-6.0.0.M5</name> + <name>JBoss Web Services - Container JBoss-6.0.0.Final</name> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M5</artifactId> - <description>JBossWS Container integration for JBoss AS 6.0.0.M5</description> + <artifactId>jbossws-jboss600</artifactId> + <description>JBossWS Container integration for JBoss AS 6.0.0.Final</description> - <version>3.4.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <!-- Parent --> <parent> @@ -18,31 +18,38 @@ <!-- 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/jboss60/branche... + <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/jboss60/branche... </scm> <!-- Properties --> <properties> - <jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version> - <jbossws.common.version>1.4.0-SNAPSHOT</jbossws.common.version> - <jbossws.spi.version>1.4.0-SNAPSHOT</jbossws.spi.version> - <jboss.version>6.0.0.20100911-M5</jboss.version> - <jboss.deployers.version>2.2.0.Alpha7</jboss.deployers.version> - <jboss.jbossxb.version>2.0.2.Beta7</jboss.jbossxb.version> - <jboss.metadata.version>2.0.0.Alpha16</jboss.metadata.version> - <jboss.reflect.version>2.2.0.Alpha9</jboss.reflect.version> - <jboss.security.version>3.0.0.Beta4</jboss.security.version> - <jboss.vfs.version>3.0.0.CR5</jboss.vfs.version> - <jboss.cl.version>2.2.0.Alpha8</jboss.cl.version> + <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version> + <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> + <jboss.version>6.0.0.Final</jboss.version> + <jboss.deployers.version>2.2.0.GA</jboss.deployers.version> + <jboss.jbossxb.version>2.0.3.GA</jboss.jbossxb.version> + <jboss.metadata.version>2.0.0.Alpha24</jboss.metadata.version> + <jboss.reflect.version>2.2.0.GA</jboss.reflect.version> + <jboss.picketbox.version>3.0.0.CR2</jboss.picketbox.version> + <jboss.vfs.version>3.0.0.GA</jboss.vfs.version> + <jboss.cl.version>2.2.0.GA</jboss.cl.version> + <jboss.weld.version>1.1.Beta2</jboss.weld.version> <jboss.hornetq.version>2.1.2.Final</jboss.hornetq.version> + <jboss.jaxws.api.version>1.0.0.Final</jboss.jaxws.api.version> </properties> <!-- DependencyManagement --> <dependencyManagement> <dependencies> <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>${jboss.jaxws.api.version}</version> + </dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <version>${jbossws.framework.version}</version> @@ -115,9 +122,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.security</groupId> + <groupId>org.picketbox</groupId> <artifactId>jboss-security-spi</artifactId> - <version>${jboss.security.version}</version> + <version>${jboss.picketbox.version}</version> </dependency> <dependency> <groupId>org.hornetq</groupId> @@ -129,6 +136,16 @@ <artifactId>hornetq-jms</artifactId> <version>${jboss.hornetq.version}</version> </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>weld-int-deployer</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + <version>${jboss.weld.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -151,9 +168,8 @@ <!-- jboss provided dependencies --> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -183,10 +199,20 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.security</groupId> + <groupId>org.picketbox</groupId> <artifactId>jboss-security-spi</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>weld-int-deployer</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + <scope>provided</scope> + </dependency> <!-- transitive dependencies --> <dependency> @@ -233,6 +259,39 @@ </resources> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>false</showDeprecation> + <compilerArguments> + <endorseddirs>${project.build.directory}/endorsed</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -36,7 +36,6 @@ */ public final class ServerConfigFactoryImpl extends ServerConfigFactory { - /** The bean name in the kernel registry. */ private static final String BEAN_NAME = "WSServerConfig"; @@ -50,7 +49,7 @@ /** * Returns config registered in MC kernel. - * + * * @return config */ public ServerConfig getServerConfig() @@ -58,8 +57,7 @@ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class); final IoCContainerProxy iocContainer = iocContainerFactory.getContainer(); - + return iocContainer.getBean(ServerConfigFactoryImpl.BEAN_NAME, ServerConfig.class); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -40,7 +40,6 @@ */ public final class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean { - /** * Constructor. */ @@ -51,17 +50,17 @@ /** * Gets server temp directory. - * + * * @return temp directory */ public File getServerTempDir() { return this.getDirFromServerConfig("ServerTempLocation"); } - + /** * Gets server home directory. - * + * * @return home directory */ public File getHomeDir() @@ -71,14 +70,14 @@ /** * Gets server data directory. - * + * * @return data directory */ public File getServerDataDir() { return this.getDirFromServerConfig("ServerDataLocation"); } - + /** * Obtains the requested directory from the server configuration. * @@ -114,5 +113,4 @@ return dir; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -21,59 +21,48 @@ */ package org.jboss.webservices.integration.deployers; -import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer; +import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.vfs.VFSInputSource; import org.jboss.vfs.VirtualFile; -import org.jboss.wsf.spi.metadata.DescriptorProcessor; -import org.jboss.xb.binding.ObjectModelFactory; -import org.xml.sax.InputSource; +import org.jboss.wsf.spi.metadata.DescriptorParser; /** - * Abstract descriptor deployer. + * Abstract descriptor deployer which deploys only if particular DD processor is available. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -abstract class AbstractDescriptorDeployer<P extends DescriptorProcessor<T>, T> extends ObjectModelFactoryDeployer<T> +abstract class AbstractDescriptorDeployer<P extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T> { - private P ddProcessor; + private P ddParser; AbstractDescriptorDeployer(Class<T> output) { super(output); this.setName("UNSPECIFIED"); - this.setUseSchemaValidation(false); } + @SuppressWarnings({"deprecation", "unchecked"}) @Override protected T parse(final VFSDeploymentUnit unit, final VirtualFile file, final T root) throws Exception { - if (this.ddProcessor != null) + if (this.ddParser != null) { - InputSource source = new VFSInputSource(file); - ObjectModelFactory factory = this.ddProcessor.getFactory(file.toURL()); - return getHelper().parse(source, root, factory); + return this.ddParser.parse(file.toURL()); } - + return null; } /** - * MC incallback method. It will be invoked each time subclass specific DescriptorProcessor bean will be installed. + * MC incallback method. It will be invoked each time subclass specific DescriptorParser bean will be installed. */ - protected void setProcessor(final P ddProcessor) + protected void setParser(final P ddParser) { - if (this.ddProcessor != null) - throw new IllegalStateException("Only one " + this.ddProcessor.getClass() + " instance can be installed in MC"); - - this.ddProcessor = ddProcessor; - this.setName(this.ddProcessor.getDescriptorName()); - this.setUseSchemaValidation(this.ddProcessor.isValidating()); + if (this.ddParser != null) + throw new IllegalStateException("Only one " + this.ddParser.getClass() + " instance can be installed in MC"); + + this.ddParser = ddParser; + this.setName(this.ddParser.getDescriptorName()); } - - @Override - protected ObjectModelFactory getObjectModelFactory(final T root) - { - throw new UnsupportedOperationException(); - } + } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,10 +31,9 @@ * when a application-client.xml descriptor file is found in the deployment. * This deployer then actually enables classpath modification when a jaxrpc-mapping * is specified in the descriptor. - * + * * @author alessio.soldano(a)jboss.com * @since 03-Feb-2010 - * */ public class JAXRPCAppClientClassPathDeployer extends JAXRPCClientClassPathDeployer<ApplicationClientMetaData> { @@ -42,7 +41,7 @@ { super(ApplicationClientMetaData.class); } - + @Override protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit) { Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -32,10 +32,9 @@ * when a application-client.xml descriptor file is found in the deployment. * This deployer then actually enables classpath modification when a jaxrpc-mapping * is specified in the descriptor. - * + * * @author alessio.soldano(a)jboss.com * @since 03-Feb-2010 - * */ public abstract class JAXRPCClientClassPathDeployer<T> extends JAXRPCIntegrationClassPathDeployer<T> { @@ -44,7 +43,7 @@ super(input); setInput(input); //makes the input mandatory instead of optional } - + protected static boolean hasJaxRpcMappingReference(ServiceReferencesMetaData serviceReferences) { if (serviceReferences != null) @@ -60,5 +59,4 @@ } return false; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -35,10 +35,9 @@ * when a ejb-jar.xml descriptor file is found in the deployment. * This deployer then actually enables classpath modification when a jaxrpc-mapping * is specified in the descriptor. - * + * * @author alessio.soldano(a)jboss.com * @since 03-Feb-2010 - * */ public class JAXRPCEjbClientClassPathDeployer extends JAXRPCClientClassPathDeployer<EjbJarMetaData> { @@ -46,7 +45,7 @@ { super(EjbJarMetaData.class); } - + @Override protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit) { Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -36,25 +36,22 @@ * An abstract deployer that properly set the classpath for JAX-RPC deployments. * This is performed adding a reference to an integration lib from the jaxrpc * deployers to the deployment unit's classpath. - * + * * @author alessio.soldano(a)jboss.com * @since 02-Feb-2010 - * */ public abstract class JAXRPCIntegrationClassPathDeployer<T> extends UrlIntegrationDeployer<T> { private Set<String> libs; - private boolean integrationLibsFound = false; private ServerConfig wsServerConfig; private boolean stackRequiresIntegration; - - + public JAXRPCIntegrationClassPathDeployer(Class<T> input) { super(input); } - + protected abstract boolean isClassPathChangeRequired(VFSDeploymentUnit unit); @Override @@ -62,13 +59,13 @@ { return stackRequiresIntegration && integrationLibsFound && isClassPathChangeRequired(unit); } - + @Override public void start() { //NOOP } - + protected Set<URL> getJBossWSIntegrationUrls() { Set<URL> result = new HashSet<URL>(); @@ -97,12 +94,7 @@ } return result; } - - /** - * Get server home. - * - * @return the jboss server home location - */ + protected String getServerHome() { return "${jboss.server.home.url}"; @@ -130,5 +122,4 @@ //the Native stack does not requires the JAXRPC additional integration stackRequiresIntegration = !wsServerConfig.getImplementationTitle().toLowerCase().contains("native"); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -30,10 +30,9 @@ * A deployer for properly setting the classpath for jaxrpc endpoint deployments; * it's triggered by the WebservicesMetaData which is attached to the unit * when a webservice.xml descriptor file is found in the deployment. - * + * * @author alessio.soldano(a)jboss.com * @since 03-Feb-2010 - * */ public class JAXRPCServerClassPathDeployer extends JAXRPCIntegrationClassPathDeployer<WebservicesMetaData> { @@ -42,7 +41,7 @@ super(WebservicesMetaData.class); setInput(WebservicesMetaData.class); //makes the input mandatory instead of optional } - + @Override protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit) { Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,10 +31,9 @@ * when a web.xml descriptor file is found in the deployment. * This deployer then actually enables classpath modification when a jaxrpc-mapping * is specified in the descriptor. - * + * * @author alessio.soldano(a)jboss.com * @since 03-Feb-2010 - * */ public class JAXRPCServletClientClassPathDeployer extends JAXRPCClientClassPathDeployer<WebMetaData> { @@ -42,7 +41,7 @@ { super(WebMetaData.class); } - + @Override protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit) { Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -21,16 +21,17 @@ */ package org.jboss.webservices.integration.deployers; -import org.jboss.wsf.spi.metadata.jms.JMSDescriptorProcessor; +import org.jboss.wsf.spi.metadata.jms.JMSDescriptorParser; import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; /** * Stack agnostic JMS descriptor deployer. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorProcessor, JMSEndpointsMetaData> +public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorParser, JMSEndpointsMetaData> { + /** * Constructor. */ @@ -40,12 +41,13 @@ } /** - * MC incallback method. It will be invoked each time JMSDescriptorProcessor bean will be installed. - * @param processor the processor + * MC incallback method. It will be invoked each time JMSDescriptorParser bean will be installed. + * @param parser the parser */ @Override - public void setProcessor(final JMSDescriptorProcessor processor) + public void setParser(final JMSDescriptorParser parser) { - super.setProcessor(processor); + super.setParser(parser); } + } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -25,16 +25,16 @@ import java.security.PrivilegedAction; /** - * + * Security actions helper. + * * @author alessio.soldano(a)jboss.com * @since 17-Feb-2010 - * */ class SecurityActions { /** * Get context classloader. - * + * * @return the current context classloader */ static ClassLoader getContextClassLoader() @@ -54,7 +54,7 @@ }); } } - + /** * Set context classloader. * @@ -78,5 +78,4 @@ }); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -36,7 +36,6 @@ */ public final class WSAspectizedDeployersFactory { - /** Logger. */ private static final Logger LOGGER = Logger.getLogger(WSAspectizedDeployersFactory.class); @@ -45,10 +44,10 @@ /** Our deployers regitry. */ private final Map<DeploymentAspect, Deployer> deployersRegistry = new HashMap<DeploymentAspect, Deployer>(); - + /** * Constructor. - * + * * @param realDeployers real deployers registry */ public WSAspectizedDeployersFactory(final DeployersImpl realDeployers) @@ -58,7 +57,7 @@ /** * MC incallback method. It will be called each time DeploymentAspect bean will be installed. - * + * * @param aspect to create real WS aspectized deployer for */ public void addDeployer(final DeploymentAspect aspect) @@ -75,7 +74,7 @@ /** * MC uncallback method. It will be called each time DeploymentAspect bean will be removed. - * + * * @param aspect to remove real WS aspectized deployer for */ public void removeDeployer(final DeploymentAspect aspect) @@ -89,5 +88,4 @@ this.deployersRegistry.remove(aspect); this.delegee.removeDeployer(wsAspectizedDeployer); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -35,7 +35,7 @@ /** * A deployer that delegates to JBossWS deployment aspect. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class WSDeploymentAspectDeployer extends AbstractRealDeployer @@ -52,7 +52,7 @@ /** * Constructor. - * + * * @param aspect deployment aspect */ WSDeploymentAspectDeployer(final DeploymentAspect aspect) @@ -102,7 +102,7 @@ /** * If deployed unit is related to web services this method delegates * to deployment aspect and calls its create() and start() methods. - * + * * @param unit deployment unit * @throws DeploymentException on deployment failure */ @@ -133,7 +133,7 @@ /** * If undeployed unit is related to web services this method delegates * to deployment aspect and calls its stop() and destroy() methods. - * + * * @param unit deployment unit */ @Override @@ -162,7 +162,7 @@ /** * Displays also WS deployment aspect being wrapped. - * + * * @return deployer instance id including wrapped deployment aspect id. */ @Override @@ -172,5 +172,4 @@ sb.append(super.toString()).append('(').append(this.aspect).append(')'); return sb.toString(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -30,13 +30,12 @@ import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** - * This deployer initializes JBossWS deployment meta data. + * This deployer initializes JBossWS deployment meta data. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public final class WSDeploymentDeployer extends AbstractRealDeployer { - /** * Constructor. */ @@ -55,7 +54,7 @@ /** * Creates new Web Service deployment and registers it with deployment unit. - * + * * @param unit deployment unit * @throws DeploymentException if any error occurs */ @@ -65,5 +64,4 @@ this.log.trace("Building JBoss agnostic webservices meta data model"); WSDeploymentBuilder.getInstance().build(unit); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -21,7 +21,7 @@ */ package org.jboss.webservices.integration.deployers; -import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor; +import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -29,8 +29,9 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorProcessor, WebservicesMetaData> +public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> { + /** * Constructor. */ @@ -38,14 +39,15 @@ { super(WebservicesMetaData.class); } - + /** - * MC incallback method. It will be invoked each time WebservicesDescriptorProcessor bean will be installed. - * @param processor the processor + * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. + * @param parser the parser */ @Override - public void setProcessor(final WebservicesDescriptorProcessor processor) + public void setParser(final WebservicesDescriptorParser parser) { - super.setProcessor(processor); + super.setParser(parser); } + } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -49,7 +49,6 @@ */ public final class WSEJBAdapterDeployer extends AbstractRealDeployer { - /** * Constructor. */ @@ -69,7 +68,7 @@ /** * Deploys WebServiceDeployment meta data. - * + * * @param unit deployment unit * @throws DeploymentException exception */ @@ -107,7 +106,7 @@ /** * Returns EJB container if EJB3 deployment is detected and EJB meta data does not represent entity bean. - * + * * @param ejb3Deployment EJB3 deployment meta data * @param ejbMD EJB meta data * @return EJB container or null if not EJB3 stateless bean @@ -150,7 +149,7 @@ /** * Constructor. - * + * * @param ejbMetaData EJB metadata * @param ejbContainer EJB container * @param loader class loader @@ -234,7 +233,6 @@ + " from loader: " + this.loader); } } - } /** @@ -243,7 +241,6 @@ */ private static final class WebServiceDeploymentAdapter implements WebServiceDeployment { - /** List of endpoints. */ private final List<WebServiceDeclaration> endpoints = new ArrayList<WebServiceDeclaration>(); @@ -257,14 +254,12 @@ /** * Returns endpoints list. - * + * * @return endpoints list */ public List<WebServiceDeclaration> getServiceEndpoints() { return this.endpoints; } - } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -39,7 +39,6 @@ */ public final class WSTypeDeployer extends AbstractRealDeployer { - /** * Constructor. */ @@ -59,7 +58,7 @@ /** * Detects WS deployment type and puts it to the deployment unit attachments. - * + * * @param unit deployment unit * @throws DeploymentException on failure */ @@ -95,7 +94,7 @@ /** * Returns true if JAXRPC EJB deployment is detected. - * + * * @param unit deployment unit * @return true if JAXRPC EJB, false otherwise */ @@ -109,7 +108,7 @@ /** * Returns true if JAXRPC JSE deployment is detected. - * + * * @param unit deployment unit * @return true if JAXRPC JSE, false otherwise */ @@ -128,7 +127,7 @@ /** * Returns true if JAXWS EJB deployment is detected. - * + * * @param unit deployment unit * @return true if JAXWS EJB, false otherwise */ @@ -146,7 +145,7 @@ /** * Returns true if JAXWS JSE deployment is detected. - * + * * @param unit deployment unit * @return true if JAXWS JSE, false otherwise */ @@ -164,7 +163,7 @@ /** * Returns true if JAXWS JMS deployment is detected. - * + * * @param unit deployment unit * @return true if JAXWS JMS, false otherwise */ @@ -172,5 +171,4 @@ { return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,6 +1,26 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; -import java.io.IOException; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -9,8 +29,8 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.logging.Logger; -import org.jboss.metadata.serviceref.VirtualFileAdaptor; import org.jboss.vfs.VirtualFile; +import org.jboss.webservices.integration.injection.VirtualFileAdaptor; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.SPIProvider; @@ -21,7 +41,6 @@ import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; /** * Base class for all deployment model builders. @@ -30,7 +49,6 @@ */ abstract class AbstractDeploymentModelBuilder implements DeploymentModelBuilder { - /** WSDL, XSD and XML files filter. */ private static final WSVirtualFileFilter WS_FILE_FILTER = new WSVirtualFileFilter(); @@ -148,7 +166,7 @@ for (VirtualFile vf : virtualFiles) { // Adding the roots of the virtual files. - uVirtualFiles.add(new VirtualFileAdaptor(vf)); // TODO: Figure out why this was using the VFS2 VFS root instead of the meta-data file itself. + uVirtualFiles.add(new VirtualFileAdaptor(vf)); } dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles)); } @@ -214,5 +232,4 @@ throw new IllegalStateException("Deployment unit does not contain " + attachment); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import org.jboss.deployers.structure.spi.DeploymentUnit; @@ -4,17 +25,15 @@ /** * Deployment builder interface. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ interface DeploymentModelBuilder { - /** * Creates Web Service deployment model and associates it with deployment. - * + * * @param unit deployment unit */ void newDeploymentModel(DeploymentUnit unit); - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import org.jboss.deployers.structure.spi.DeploymentUnit; @@ -11,12 +32,11 @@ /** * Creates new JAXRPC EJB21 deployment. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class DeploymentModelBuilderJAXRPC_EJB21 extends AbstractDeploymentModelBuilder { - /** * Constructor. */ @@ -27,7 +47,7 @@ /** * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. - * + * * @param dep webservice deployment * @param unit deployment unit */ @@ -53,5 +73,4 @@ } } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import org.jboss.deployers.structure.spi.DeploymentUnit; @@ -11,12 +32,11 @@ /** * Creates new JAXRPC JSE deployment. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class DeploymentModelBuilderJAXRPC_JSE extends AbstractDeploymentModelBuilder { - /** * Constructor. */ @@ -27,7 +47,7 @@ /** * Creates new JAXRPC JSE deployment and registers it with deployment unit. - * + * * @param dep webservice deployment * @param unit deployment unit */ @@ -52,5 +72,4 @@ } } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import org.jboss.deployers.structure.spi.DeploymentUnit; @@ -10,12 +31,11 @@ /** * Creates new JAXWS EJB3 deployment. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class DeploymentModelBuilderJAXWS_EJB3 extends AbstractDeploymentModelBuilder { - /** * Constructor. */ @@ -26,7 +46,7 @@ /** * Creates new JAXWS EJB3 deployment and registers it with deployment unit. - * + * * @param dep webservice deployment * @param unit deployment unit */ @@ -48,5 +68,4 @@ ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -32,40 +32,38 @@ import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; /** - * Create JAXWS SPI Deployment for JAXWS_JMS type deployment - * @author <a herf=&quot;ema(a)redhat.com&gt;Jim Ma</a> + * Create JAXWS SPI Deployment for JAXWS_JMS type deployment. * + * @author <a herf=&quot;ema(a)redhat.com&gt;Jim Ma</a> */ public class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder { + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_JMS() + { + super(); + } - /** - * Constructor. - */ - DeploymentModelBuilderJAXWS_JMS() - { - super(); - } - - /** - * Creates new JAXWS JMS deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(JMSEndpointsMetaData.class, unit, dep); - JMSEndpointsMetaData jmsEndpointsMD = dep.getAttachment(JMSEndpointsMetaData.class); - for (JMSEndpointMetaData endpoint : jmsEndpointsMD.getEndpointsMetaData()) - { - if (endpoint.getName() == null) - { - endpoint.setName(endpoint.getImplementor()); - } - this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep); - } - } - - } \ No newline at end of file + /** + * Creates new JAXWS JMS deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(JMSEndpointsMetaData.class, unit, dep); + JMSEndpointsMetaData jmsEndpointsMD = dep.getAttachment(JMSEndpointsMetaData.class); + for (JMSEndpointMetaData endpoint : jmsEndpointsMD.getEndpointsMetaData()) + { + if (endpoint.getName() == null) + { + endpoint.setName(endpoint.getImplementor()); + } + this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep); + } + } +} \ No newline at end of file Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import java.util.List; @@ -10,12 +31,11 @@ /** * Creates new JAXWS JSE deployment. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class DeploymentModelBuilderJAXWS_JSE extends AbstractDeploymentModelBuilder { - /** * Constructor. */ @@ -26,7 +46,7 @@ /** * Creates new JAXWS JSE deployment and registers it with deployment unit. - * + * * @param dep webservice deployment * @param unit deployment unit */ @@ -47,5 +67,4 @@ this.newHttpEndpoint(servletClass, servletName, dep); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -35,7 +35,6 @@ */ public final class WSDeploymentBuilder { - /** Builder instance. */ private static final WSDeploymentBuilder SINGLETON = new WSDeploymentBuilder(); @@ -61,7 +60,7 @@ /** * Factory method for obtaining builder instance. - * + * * @return builder instance */ public static WSDeploymentBuilder getInstance() @@ -71,7 +70,7 @@ /** * Builds JBossWS deployment model if web service deployment is detected. - * + * * @param unit deployment unit */ public void build(final DeploymentUnit unit) @@ -83,5 +82,4 @@ WSDeploymentBuilder.builders.get(deploymentType).newDeploymentModel(unit); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.webservices.integration.deployers.deployment; import org.jboss.vfs.VirtualFile; @@ -6,18 +27,17 @@ /** * WS file filter for files with the '.wsdl', or '.xsd' or '.xml' suffix. - * + * * @author <a href="mailto:dbevenius@jboss.com">Daniel Bevenius</a> * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ final class WSVirtualFileFilter implements VirtualFileFilterWithAttributes { - /** The tree walking attributes. */ private VisitorAttributes attributes; /** - * Constructor. + * Constructor. */ WSVirtualFileFilter() { @@ -26,7 +46,7 @@ /** * Constructor. - * + * * @param attributes visit attributes */ WSVirtualFileFilter(final VisitorAttributes attributes) @@ -36,7 +56,7 @@ /** * Gets VisitorAttributes for this instance. - * + * * @return visitor attributes */ public VisitorAttributes getAttributes() @@ -64,5 +84,4 @@ return hasWsdlSuffix || hasXsdSuffix || hasXmlSuffix; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -29,9 +29,8 @@ /** * A JMS endpoint resolver meant for working with HornetQ destination implementation - * - * @author alessio.soldano(a)jboss.com * + * @author alessio.soldano(a)jboss.com */ public class HornetQJMSResolver extends DefaultJMSEndpointResolver { @@ -46,5 +45,4 @@ super.setDestination(destination); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -27,8 +27,8 @@ import javax.ejb.EJB; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.ejb3.common.resolvers.spi.EjbReference; -import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver; +import org.jboss.ejb3.ejbref.resolver.spi.EjbReference; +import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver; import org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver; /** @@ -38,7 +38,6 @@ */ final class EJBBeanReferenceResolver extends AbstractReferenceResolver<EJB> { - /** * Deployment unit used for resolving process. */ @@ -74,7 +73,7 @@ /** * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field) - * + * * @param field to be resolved * @return JNDI name of referenced EJB object */ @@ -90,7 +89,7 @@ /** * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method) - * + * * @param method to be resolved * @return JNDI name of referenced EJB object */ @@ -120,5 +119,4 @@ } return new EjbReference(ejbAnnotation.beanName(), beanInterface, ejbAnnotation.mappedName()); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -33,7 +33,7 @@ import javax.ejb.EJB; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver; +import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver; import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData; @@ -102,7 +102,7 @@ /** * Builds injection meta data for all endpoints in deployment. - * + * * @param dep webservice deployment */ @Override @@ -154,7 +154,7 @@ /** * Returns environment entries meta data associated with specified EJB 3 bean. - * + * * @param ejbName EJB 3 bean to lookup environment entries for * @param unit deployment unit * @return environment entries meta data @@ -185,7 +185,7 @@ /** * Builds JBossWS specific injections meta data. - * + * * @param envEntriesMD environment entries meta data * @param resolvers known annotation resolvers * @param jndiContext JNDI context to be propagated @@ -253,5 +253,4 @@ return retVal; } - } Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,700 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservices.integration.injection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.naming.Referenceable; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import javax.xml.ws.soap.MTOM; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.switchboard.javaee.environment.Addressing; +import org.jboss.switchboard.javaee.environment.Handler; +import org.jboss.switchboard.javaee.environment.HandlerChain; +import org.jboss.switchboard.javaee.environment.InjectionTarget; +import org.jboss.switchboard.javaee.environment.PortComponent; +import org.jboss.switchboard.javaee.environment.ServiceRefType; +import org.jboss.switchboard.javaee.jboss.environment.JBossPortComponent; +import org.jboss.switchboard.javaee.jboss.environment.JBossServiceRefType; +import org.jboss.switchboard.mc.spi.MCBasedResourceProvider; +import org.jboss.switchboard.spi.Resource; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler; +import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; + +/** + * Service reference resource provider. + * + * Conventions used in this source code are: + * <ul> + * <li>SBMD - switch board meta data</li> + * <li>UMDM - jbossws unified meta data model</li> + * </ul> + * + * @author alessio.soldano(a)jboss.com + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class ServiceRefResourceProvider implements MCBasedResourceProvider<ServiceRefType> +{ + + private static final Logger log = Logger.getLogger(ServiceRefResourceProvider.class); + + private final ServiceRefHandler delegate; + + /** + * Constructor. + */ + public ServiceRefResourceProvider() + { + final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + this.delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler(); + } + + /** + * Provides service ref resource. + */ + @Override + public Resource provide(final DeploymentUnit deploymentUnit, final ServiceRefType serviceRefSBMD) + { + final ClassLoader newLoader = deploymentUnit.getClassLoader(); + final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + + try + { + Thread.currentThread().setContextClassLoader(newLoader); + final UnifiedVirtualFile vfsRoot = this.getUnifiedVirtualFile(deploymentUnit); + final UnifiedServiceRefMetaData serviceRefUMDM = this.getUnifiedServiceRefMetaData(vfsRoot, serviceRefSBMD, + newLoader); + final Referenceable jndiReferenceable = this.delegate.createReferenceable(serviceRefUMDM); + + return new ServiceRefResource(jndiReferenceable); + } + finally + { + Thread.currentThread().setContextClassLoader(oldLoader); + } + } + + /** + * Inform about type this resource handler can handle. + * + * @return handled type + */ + @Override + public Class<ServiceRefType> getEnvironmentEntryType() + { + return ServiceRefType.class; + } + + /** + * Constructs vfs root from deployment unit. + * + * @param deploymentUnit + * @return vfs root + */ + private UnifiedVirtualFile getUnifiedVirtualFile(final DeploymentUnit deploymentUnit) + { + DeploymentUnit tempDeploymentUnit = deploymentUnit; + while (tempDeploymentUnit.isComponent()) + tempDeploymentUnit = tempDeploymentUnit.getParent(); + + if (tempDeploymentUnit instanceof VFSDeploymentUnit) + { + VFSDeploymentUnit vdu = (VFSDeploymentUnit) tempDeploymentUnit; + return new VirtualFileAdaptor(vdu.getRoot()); + } + else + { + throw new IllegalArgumentException("Can only handle real VFS deployments: " + tempDeploymentUnit); + } + } + + /** + * Translates service ref switchboard meta data to JBossWS unified service ref meta data. + * + * @param vfsRoot virtual file system root + * @param serviceRefSBMD service reference switchboard meta data + * @return unified jbossws service reference meta data + */ + private UnifiedServiceRefMetaData getUnifiedServiceRefMetaData(final UnifiedVirtualFile vfsRoot, + final ServiceRefType serviceRefSBMD, final ClassLoader loader) + { + final UnifiedServiceRefMetaData serviceRefUMDM = new UnifiedServiceRefMetaData(vfsRoot); + serviceRefUMDM.setServiceRefName(serviceRefSBMD.getName()); + serviceRefUMDM.setServiceRefType(serviceRefSBMD.getType()); + serviceRefUMDM.setServiceInterface(serviceRefSBMD.getServiceInterface()); + serviceRefUMDM.setWsdlFile(serviceRefSBMD.getWsdlFile()); + serviceRefUMDM.setMappingFile(serviceRefSBMD.getMappingFile()); + serviceRefUMDM.setServiceQName(serviceRefSBMD.getQName()); + serviceRefUMDM.setHandlerChain(serviceRefSBMD.getHandlerChain()); + + // propagate addressing properties + serviceRefUMDM.setAddressingAnnotationSpecified(serviceRefSBMD.isAddressingFeatureEnabled()); + serviceRefUMDM.setAddressingEnabled(serviceRefSBMD.isAddressingEnabled()); + serviceRefUMDM.setAddressingRequired(serviceRefSBMD.isAddressingRequired()); + serviceRefUMDM.setAddressingResponses(serviceRefSBMD.getAddressingResponses()); + + // propagate MTOM properties + serviceRefUMDM.setMtomAnnotationSpecified(serviceRefSBMD.isMtomFeatureEnabled()); + serviceRefUMDM.setMtomEnabled(serviceRefSBMD.isMtomEnabled()); + serviceRefUMDM.setMtomThreshold(serviceRefSBMD.getMtomThreshold()); + + // propagate respect binding properties + serviceRefUMDM.setRespectBindingAnnotationSpecified(serviceRefSBMD.isRespectBindingFeatureEnabled()); + serviceRefUMDM.setRespectBindingEnabled(serviceRefSBMD.isRespectBindingEnabled()); + + // process injection targets + if (serviceRefSBMD.getInjectionTargets() != null && serviceRefSBMD.getInjectionTargets().size() > 0) + { + if (serviceRefSBMD.getInjectionTargets().size() > 1) + { + // TODO: We should validate all the injection targets whether they're compatible. + // This means all the injection targets must be assignable or equivalent. + // If there are @Addressing, @RespectBinding or @MTOM annotations present on injection targets, + // these annotations must be equivalent for all the injection targets. + } + final InjectionTarget injectionTarget = serviceRefSBMD.getInjectionTargets().iterator().next(); + + AccessibleObject anAlement = this.findInjectionTarget(loader, injectionTarget); + this.processAnnotatedElement(anAlement, serviceRefUMDM); + } + + // propagate port compoments + final Collection<? extends PortComponent> portComponentsSBMD = serviceRefSBMD.getPortComponents(); + if (portComponentsSBMD != null) + { + for (final PortComponent portComponentSBMD : portComponentsSBMD) + { + final UnifiedPortComponentRefMetaData portComponentUMDM = this.getUnifiedPortComponentRefMetaData( + serviceRefUMDM, portComponentSBMD); + if (portComponentUMDM.getServiceEndpointInterface() != null || portComponentUMDM.getPortQName() != null) + { + serviceRefUMDM.addPortComponentRef(portComponentUMDM); + } + else + { + log.warn("Ignoring <port-component-ref> without <service-endpoint-interface> and <port-qname>: " + + portComponentUMDM); + } + } + } + + // propagate handlers + final Collection<Handler> handlersSBMD = serviceRefSBMD.getHandlers(); + if (handlersSBMD != null) + { + for (final Handler handlerSBMD : handlersSBMD) + { + final UnifiedHandlerMetaData handlerUMDM = this.getUnifiedHandlerMetaData(handlerSBMD); + serviceRefUMDM.addHandler(handlerUMDM); + } + } + + // propagate handler chains + final List<HandlerChain> handlerChainsSBMD = serviceRefSBMD.getHandlerChains(); + if (handlerChainsSBMD != null) + { + final UnifiedHandlerChainsMetaData handlerChainsUMDM = this.getUnifiedHandlerChainsMetaData(handlerChainsSBMD); + serviceRefUMDM.setHandlerChains(handlerChainsUMDM); + } + + // propagate jboss specific MD + if (serviceRefSBMD instanceof JBossServiceRefType) + { + this.processUnifiedJBossServiceRefMetaData(serviceRefUMDM, serviceRefSBMD); + } + + // detect JAXWS or JAXRPC type + this.processType(serviceRefUMDM); + + return serviceRefUMDM; + } + + /** + * Translates jboss service ref switchboard meta data to JBossWS unified service ref meta data. + * + * @param serviceRefUMDM service reference unified meta data + * @param serviceRefSBMD service reference switchboard meta data + */ + private void processUnifiedJBossServiceRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM, + final ServiceRefType serviceRefSBMD) + { + final JBossServiceRefType jbossServiceRefSBMD = (JBossServiceRefType) serviceRefSBMD; + serviceRefUMDM.setServiceImplClass(jbossServiceRefSBMD.getServiceClass()); + serviceRefUMDM.setConfigName(jbossServiceRefSBMD.getConfigName()); + serviceRefUMDM.setConfigFile(jbossServiceRefSBMD.getConfigFile()); + serviceRefUMDM.setWsdlOverride(jbossServiceRefSBMD.getWsdlOverride()); + serviceRefUMDM.setHandlerChain(jbossServiceRefSBMD.getHandlerChain()); + } + + /** + * Translates handler chains switchboard meta data to JBossWS unified handler chains meta data. + * + * @param handlerChainsSBMD handler chains switchboard meta data + * @return handler chains JBossWS unified meta data + */ + private UnifiedHandlerChainsMetaData getUnifiedHandlerChainsMetaData(final List<HandlerChain> handlerChainsSBMD) + { + final UnifiedHandlerChainsMetaData handlerChainsUMDM = new UnifiedHandlerChainsMetaData(); + + for (final HandlerChain handlerChainSBMD : handlerChainsSBMD) + { + final UnifiedHandlerChainMetaData handlerChainUMDM = new UnifiedHandlerChainMetaData(); + handlerChainUMDM.setServiceNamePattern(handlerChainSBMD.getServiceNamePattern()); + handlerChainUMDM.setPortNamePattern(handlerChainSBMD.getPortNamePattern()); + handlerChainUMDM.setProtocolBindings(handlerChainSBMD.getProtocolBindings()); + + final List<Handler> handlersSBMD = handlerChainSBMD.getHandlers(); + for (final Handler handlerSBMD : handlersSBMD) + { + final UnifiedHandlerMetaData handlerUMDM = getUnifiedHandlerMetaData(handlerSBMD); + handlerChainUMDM.addHandler(handlerUMDM); + } + + handlerChainsUMDM.addHandlerChain(handlerChainUMDM); + } + + return handlerChainsUMDM; + } + + /** + * Translates handler switchboard meta data to JBossWS unified handler meta data. + * + * @param handlerSBMD handler switchboard meta data + * @return handler JBossWS unified meta data + */ + private UnifiedHandlerMetaData getUnifiedHandlerMetaData(final Handler handlerSBMD) + { + final UnifiedHandlerMetaData handlerUMDM = new UnifiedHandlerMetaData(); + handlerUMDM.setHandlerName(handlerSBMD.getHandlerName()); + handlerUMDM.setHandlerClass(handlerSBMD.getHandlerClass()); + + // translate handler init params + final Map<String, String> handlerInitParamsSBMD = handlerSBMD.getInitParams(); + if (handlerInitParamsSBMD != null) + { + for (final String initParamName : handlerInitParamsSBMD.keySet()) + { + final UnifiedInitParamMetaData handlerInitParamUMDM = new UnifiedInitParamMetaData(); + handlerInitParamUMDM.setParamName(initParamName); + handlerInitParamUMDM.setParamValue(handlerInitParamsSBMD.get(initParamName)); + handlerUMDM.addInitParam(handlerInitParamUMDM); + } + } + + // translate handler soap headers + final Collection<QName> handlerSoapHeadersSBDM = handlerSBMD.getSoapHeaders(); + if (handlerSoapHeadersSBDM != null) + { + for (final QName soapHeader : handlerSoapHeadersSBDM) + { + handlerUMDM.addSoapHeader(soapHeader); + } + } + + // translate handler soap roles + final Collection<String> handlerSoapRolesSBMD = handlerSBMD.getSoapRoles(); + if (handlerSoapRolesSBMD != null) + { + for (final String soapRole : handlerSoapRolesSBMD) + { + handlerUMDM.addSoapRole(soapRole); + } + } + + // translate handler port names + final Collection<String> handlerPortNamesSBMD = handlerSBMD.getPortNames(); + if (handlerPortNamesSBMD != null) + { + for (final String portName : handlerPortNamesSBMD) + { + handlerUMDM.addPortName(portName); + } + } + + return handlerUMDM; + } + + /** + * Translates port component ref switchboard meta data to JBossWS unified port component ref meta data. + * + * @param serviceRefUMDM service ref unified meta data + * @param portComponentSBMD port component ref switchboard meta data + * @return port component ref unified meta data + */ + private UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData( + final UnifiedServiceRefMetaData serviceRefUMDM, final PortComponent portComponentSBMD) + { + final UnifiedPortComponentRefMetaData portComponentUMDM = new UnifiedPortComponentRefMetaData(serviceRefUMDM); + + // propagate service endpoint interface + portComponentUMDM.setServiceEndpointInterface(portComponentSBMD.getEndpointInterface()); + + // propagate MTOM properties + portComponentUMDM.setMtomEnabled(portComponentSBMD.isMtomEnabled()); + portComponentUMDM.setMtomThreshold(portComponentSBMD.getMtomThreshold()); + + // propagate addressing properties + final Addressing addressingSBMD = portComponentSBMD.getAddressing(); + if (addressingSBMD != null) + { + portComponentUMDM.setAddressingEnabled(addressingSBMD.isEnabled()); + portComponentUMDM.setAddressingRequired(addressingSBMD.isRequired()); + portComponentUMDM.setAddressingResponses(addressingSBMD.getResponses()); + } + + // propagate respect binding properties + portComponentUMDM.setRespectBindingEnabled(portComponentSBMD.isRespectBindingEnabled()); + + // propagate link + portComponentUMDM.setPortComponentLink(portComponentSBMD.getLink()); + + // propagate jboss specific MD + if (portComponentSBMD instanceof JBossPortComponent) + { + this.processUnifiedJBossPortComponentRefMetaData(portComponentUMDM, portComponentSBMD); + } + + return portComponentUMDM; + } + + /** + * Translates jboss port component ref switchboard meta data to JBossWS unified port component ref meta data. + * + * @param portComponentUMDM port component unified meta data + * @param portComponentSBMD port component switchboard meta data + */ + private void processUnifiedJBossPortComponentRefMetaData(final UnifiedPortComponentRefMetaData portComponentUMDM, + final PortComponent portComponentSBMD) + { + final JBossPortComponent jbossPortComponentSBMD = (JBossPortComponent) portComponentSBMD; + + // propagate port QName + portComponentUMDM.setPortQName(jbossPortComponentSBMD.getPortQName()); + + // propagate configuration properties + portComponentUMDM.setConfigName(jbossPortComponentSBMD.getConfigName()); + portComponentUMDM.setConfigFile(jbossPortComponentSBMD.getConfigFile()); + + // propagate stub properties + final Map<String, String> stubPropertiesSBMD = jbossPortComponentSBMD.getStubProperties(); + if (stubPropertiesSBMD != null) + { + for (final String propertyName : stubPropertiesSBMD.keySet()) + { + final UnifiedStubPropertyMetaData stubPropertyUMDM = new UnifiedStubPropertyMetaData(); + stubPropertyUMDM.setPropName(propertyName); + stubPropertyUMDM.setPropValue(stubPropertiesSBMD.get(propertyName)); + portComponentUMDM.addStubProperty(stubPropertyUMDM); + } + } + + // propagate call properties + final Map<String, String> callPropertiesSBMD = jbossPortComponentSBMD.getCallProperties(); + if (callPropertiesSBMD != null) + { + for (final String propertyName : callPropertiesSBMD.keySet()) + { + final UnifiedCallPropertyMetaData callPropertyUMDM = new UnifiedCallPropertyMetaData(); + callPropertyUMDM.setPropName(propertyName); + callPropertyUMDM.setPropValue(callPropertiesSBMD.get(propertyName)); + portComponentUMDM.addCallProperty(callPropertyUMDM); + } + } + } + + /** + * Switchboard service ref resource. + */ + private static final class ServiceRefResource implements Resource + { + private final Referenceable target; + + private ServiceRefResource(final Referenceable target) + { + this.target = target; + } + + @Override + public Object getDependency() + { + return null; + } + + @Override + public Object getTarget() + { + return this.target; + } + + @Override + public Collection<?> getInvocationDependencies() + { + return null; + } + } + + private void processAnnotatedElement(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM) + { + this.processAddressingAnnotation(anElement, serviceRefUMDM); + this.processMTOMAnnotation(anElement, serviceRefUMDM); + this.processRespectBindingAnnotation(anElement, serviceRefUMDM); + this.processHandlerChainAnnotation(anElement, serviceRefUMDM); + this.processServiceRefType(anElement, serviceRefUMDM); + } + + // TODO: use classloader to detect service ref type + private void processType(final UnifiedServiceRefMetaData serviceRefUMDM) + { + final boolean isJAXRPC = serviceRefUMDM.getMappingFile() != null // TODO: is mappingFile check required? + || "javax.xml.rpc.Service".equals(serviceRefUMDM.getServiceInterface()); + + serviceRefUMDM.setType(isJAXRPC ? Type.JAXRPC : Type.JAXWS); + } + + private void processAddressingAnnotation(final AnnotatedElement anElement, + final UnifiedServiceRefMetaData serviceRefUMDM) + { + final javax.xml.ws.soap.Addressing addressingAnnotation = this.getAnnotation(anElement, + javax.xml.ws.soap.Addressing.class); + + if (addressingAnnotation != null) + { + serviceRefUMDM.setAddressingAnnotationSpecified(true); + serviceRefUMDM.setAddressingEnabled(addressingAnnotation.enabled()); + serviceRefUMDM.setAddressingRequired(addressingAnnotation.required()); + serviceRefUMDM.setAddressingResponses(addressingAnnotation.responses().toString()); + } + } + + private void processMTOMAnnotation(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM) + { + final MTOM mtomAnnotation = this.getAnnotation(anElement, MTOM.class); + + if (mtomAnnotation != null) + { + serviceRefUMDM.setMtomAnnotationSpecified(true); + serviceRefUMDM.setMtomEnabled(mtomAnnotation.enabled()); + serviceRefUMDM.setMtomThreshold(mtomAnnotation.threshold()); + } + } + + private void processRespectBindingAnnotation(final AnnotatedElement anElement, + final UnifiedServiceRefMetaData serviceRefUMDM) + { + final javax.xml.ws.RespectBinding respectBindingAnnotation = this.getAnnotation(anElement, + javax.xml.ws.RespectBinding.class); + + if (respectBindingAnnotation != null) + { + serviceRefUMDM.setRespectBindingAnnotationSpecified(true); + serviceRefUMDM.setRespectBindingEnabled(respectBindingAnnotation.enabled()); + } + } + + private void processServiceRefType(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM) + { + if (anElement instanceof Field) + { + final Class<?> targetClass = ((Field) anElement).getType(); + serviceRefUMDM.setServiceRefType(targetClass.getName()); + + if (Service.class.isAssignableFrom(targetClass)) + serviceRefUMDM.setServiceInterface(targetClass.getName()); + } + else if (anElement instanceof Method) + { + final Class<?> targetClass = ((Method) anElement).getParameterTypes()[0]; + serviceRefUMDM.setServiceRefType(targetClass.getName()); + + if (Service.class.isAssignableFrom(targetClass)) + serviceRefUMDM.setServiceInterface(targetClass.getName()); + } + else + { + final WebServiceRef serviceRefAnnotation = this.getWebServiceRefAnnotation(anElement, serviceRefUMDM); + Class<?> targetClass = null; + if (serviceRefAnnotation != null && (serviceRefAnnotation.type() != Object.class)) + { + targetClass = serviceRefAnnotation.type(); + serviceRefUMDM.setServiceRefType(targetClass.getName()); + + if (Service.class.isAssignableFrom(targetClass)) + serviceRefUMDM.setServiceInterface(targetClass.getName()); + } + } + } + + private void processHandlerChainAnnotation(final AnnotatedElement anElement, + final UnifiedServiceRefMetaData serviceRefUMDM) + { + final javax.jws.HandlerChain handlerChainAnnotation = this.getAnnotation(anElement, javax.jws.HandlerChain.class); + + if (handlerChainAnnotation != null) + { + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = null; + if (handlerChainAnnotation.file().length() > 0) + handlerChain = handlerChainAnnotation.file(); + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ignored) + { + final Class<?> declaringClass = getDeclaringClass(anElement); + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + } + + serviceRefUMDM.setHandlerChain(handlerChain); + } + } + } + + private Class<?> getDeclaringClass(final AnnotatedElement annotatedElement) + { + Class<?> declaringClass = null; + if (annotatedElement instanceof Field) + declaringClass = ((Field) annotatedElement).getDeclaringClass(); + else if (annotatedElement instanceof Method) + declaringClass = ((Method) annotatedElement).getDeclaringClass(); + else if (annotatedElement instanceof Class) + declaringClass = (Class<?>) annotatedElement; + + return declaringClass; + } + + private <T extends Annotation> T getAnnotation(final AnnotatedElement anElement, final Class<T> annotationClass) + { + return anElement != null ? (T) anElement.getAnnotation(annotationClass) : null; + } + + private WebServiceRef getWebServiceRefAnnotation(final AnnotatedElement anElement, + final UnifiedServiceRefMetaData serviceRefUMDM) + { + final WebServiceRef webServiceRefAnnotation = this.getAnnotation(anElement, WebServiceRef.class); + final WebServiceRefs webServiceRefsAnnotation = this.getAnnotation(anElement, WebServiceRefs.class); + + if (webServiceRefAnnotation == null && webServiceRefsAnnotation == null) + { + return null; + } + + // Build the list of @WebServiceRef relevant annotations + final List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + + if (webServiceRefAnnotation != null) + { + wsrefList.add(webServiceRefAnnotation); + } + + if (webServiceRefsAnnotation != null) + { + for (final WebServiceRef webServiceRefAnn : webServiceRefsAnnotation.value()) + { + wsrefList.add(webServiceRefAnn); + } + } + + // Return effective @WebServiceRef annotation + WebServiceRef returnValue = null; + if (wsrefList.size() == 1) + { + returnValue = wsrefList.get(0); + } + else + { + for (WebServiceRef webServiceRefAnn : wsrefList) + { + if (serviceRefUMDM.getServiceRefName().endsWith(webServiceRefAnn.name())) + { + returnValue = webServiceRefAnn; + break; + } + } + } + + return returnValue; + } + + private AccessibleObject findInjectionTarget(ClassLoader loader, InjectionTarget target) + { + Class<?> clazz = null; + try + { + clazz = loader.loadClass(target.getTargetClass()); + } + catch (ClassNotFoundException e) + { + throw new RuntimeException("<injection-target> class: " + target.getTargetClass() + + " was not found in deployment"); + } + + for (Field field : clazz.getDeclaredFields()) + { + if (target.getTargetName().equals(field.getName())) + return field; + } + + for (Method method : clazz.getDeclaredMethods()) + { + if (method.getName().equals(target.getTargetName())) + return method; + } + + throw new RuntimeException("<injection-target> could not be found: " + target.getTargetClass() + "." + + target.getTargetName()); + + } +} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,244 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.webservices.integration.injection; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamField; +import java.io.OutputStream; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; +import java.util.jar.JarOutputStream; + +import org.jboss.vfs.VFS; +import org.jboss.vfs.VFSUtils; +import org.jboss.vfs.VirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile; + +/** + * A VirtualFile adaptor. + * + * @author Thomas.Diesler(a)jboss.org + * @author Ales.Justin(a)jboss.org + * @author alessio.soldano(a)jboss.com + */ +public final class VirtualFileAdaptor implements WritableUnifiedVirtualFile +{ + private static final long serialVersionUID = -4509594124653184348L; + + private static final ObjectStreamField[] serialPersistentFields = + { + new ObjectStreamField("rootUrl", URL.class), + new ObjectStreamField("path", String.class), + new ObjectStreamField("requiresMount", boolean.class) + }; + + /** Minimal info to get full vfs file structure */ + private URL rootUrl; + private String path; + private boolean requiresMount; + /** The virtual file */ + private transient VirtualFile file; + + public VirtualFileAdaptor(VirtualFile file) + { + this.file = file; + } + + public VirtualFileAdaptor(URL rootUrl, String path) + { + this(rootUrl, path, false); + } + + protected VirtualFileAdaptor(URL rootUrl, String path, boolean requiresMount) + { + if (rootUrl == null) + throw new IllegalArgumentException("Null root url"); + if (path == null) + throw new IllegalArgumentException("Null path"); + + this.rootUrl = rootUrl; + this.path = path; + this.requiresMount = requiresMount; + } + + /** + * Get the virtual file. + * Create file from root url and path if it doesn't exist yet. + * + * @return virtual file root + * @throws IOException for any error + */ + protected VirtualFile getFile() throws IOException + { + if (file == null) + { + VirtualFile root; + try + { + root = VFS.getChild(rootUrl); + } + catch (URISyntaxException e) + { + throw new IOException("Unable to get Virtualfile from URL: " + rootUrl, e); + } + file = root.getChild(path); + + if (!file.exists()) + { + throw new IOException("VirtualFile " + file + " does not exist"); + } + else if (requiresMount && !isMounted(root, file)) + { + throw new IOException("VirtualFile " + file + " is not mounted"); + } + } + return file; + } + + private static boolean isMounted(VirtualFile root, VirtualFile child) throws IOException + { + return !(root.getPathName().equals(root.getPhysicalFile().getAbsolutePath()) && child.getPathName().equals(child.getPhysicalFile().getAbsolutePath())); + } + + public UnifiedVirtualFile findChild(String child) throws IOException + { + final VirtualFile virtualFile = getFile(); + final VirtualFile childFile = file.getChild(child); + if(!childFile.exists()) + throw new IOException("Child '" + child + "' not found for VirtualFile " + virtualFile); + return new VirtualFileAdaptor(childFile); + } + + public URL toURL() + { + try + { + return getFile().toURL(); + } + catch (Exception e) + { + return null; + } + } + + public void writeContent(OutputStream bos) throws IOException + { + writeContent(bos, null); + } + + public void writeContent(OutputStream bos, NameFilter filter) throws IOException + { + InputStream is = null; + try + { + is = getFile().openStream(); + if (is instanceof JarInputStream) + { + JarInputStream jis = (JarInputStream)is; + JarOutputStream os = new JarOutputStream(bos); + JarEntry je = null; + while ((je = jis.getNextJarEntry()) != null) + { + if (filter != null && filter.accept(je.getName())) + { + os.putNextEntry(je); + VFSUtils.copyStream(jis, os); + } + } + VFSUtils.safeClose(os); + } + else + { + VFSUtils.copyStream(is, bos); + } + } + finally + { + VFSUtils.safeClose(is); + } + } + + private void writeObject(ObjectOutputStream out) throws IOException, URISyntaxException + { + VirtualFile file = getFile(); + URL url = rootUrl; + if (url == null) + { + VirtualFile parentFile = file.getParent(); + url = parentFile != null ? parentFile.toURL() : null; + } + String pathName = path; + if (pathName == null) + pathName = file.getName(); + + ObjectOutputStream.PutField fields = out.putFields(); + fields.put("rootUrl", url); + fields.put("path", pathName); + + VirtualFile newRoot = VFS.getChild(url); + VirtualFile newChild = newRoot.getChild(pathName); + fields.put("requiresMount", isMounted(newRoot, newChild)); + + out.writeFields(); + } + + private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException + { + ObjectInputStream.GetField fields = in.readFields(); + rootUrl = (URL) fields.get("rootUrl", null); + path = (String) fields.get("path", null); + requiresMount = fields.get("requiresMount", false); + } + + public List<UnifiedVirtualFile> getChildren() throws IOException + { + List<VirtualFile> vfList = getFile().getChildren(); + if (vfList == null) + return null; + List<UnifiedVirtualFile> uvfList = new LinkedList<UnifiedVirtualFile>(); + for (VirtualFile vf : vfList) + { + uvfList.add(new VirtualFileAdaptor(vf)); + } + return uvfList; + } + + public String getName() + { + try + { + return getFile().getName(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.webservices.integration.injection; + +import java.util.Collection; + +import javax.xml.ws.WebServiceContext; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType; +import org.jboss.switchboard.mc.spi.MCBasedResourceProvider; +import org.jboss.switchboard.spi.Resource; +import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext; + +/** + * WebServiceContext resource provider. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class WebServiceContextResourceProvider implements MCBasedResourceProvider<JBossResourceEnvRefType> +{ + + @Override + public Resource provide(final DeploymentUnit unit, final JBossResourceEnvRefType resEnvRef) + { + return new WebServiceContextResource(ThreadLocalAwareWebServiceContext.getInstance()); + } + + @Override + public Class<JBossResourceEnvRefType> getEnvironmentEntryType() + { + return JBossResourceEnvRefType.class; + } + + /** + * Switchboard web service context resource. + */ + private static final class WebServiceContextResource implements Resource + { + private final WebServiceContext target; + + private WebServiceContextResource(final WebServiceContext target) + { + this.target = target; + } + + @Override + public Object getDependency() + { + return null; + } + + @Override + public Object getTarget() + { + return this.target; + } + + @Override + public Collection<?> getInvocationDependencies() + { + return null; + } + } +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -59,7 +59,6 @@ */ final class InvocationHandlerEJB21 extends AbstractInvocationHandler { - /** EJB21 JNDI name. */ private String jndiName; @@ -74,14 +73,12 @@ */ InvocationHandlerEJB21() { - super(); - this.server = MBeanServerLocator.locateJBoss(); } /** * Initializes EJB 21 endpoint. - * + * * @param endpoint web service endpoint */ public void init(final Endpoint endpoint) @@ -107,7 +104,7 @@ /** * Gets EJB 21 container name lazily. - * + * * @param endpoint webservice endpoint * @return EJB21 container name */ @@ -133,7 +130,7 @@ /** * Invokes EJB 21 endpoint. - * + * * @param endpoint EJB 21 endpoint * @param wsInvocation web service invocation * @throws Exception if any error occurs @@ -164,7 +161,7 @@ /** * Returns configured EJB 21 JBoss MBean invocation. - * + * * @param wsInvocation webservice invocation * @return configured JBoss invocation */ @@ -208,7 +205,7 @@ /** * This method dynamically inserts EJB 21 webservice endpoint interceptor * to the last but one position in EJB 21 processing chain. See [JBWS-756] for more info. - * + * * @param objectName EJB 21 object name * @param ejbName EJB 21 short name */ @@ -244,5 +241,4 @@ this.log.warn("Cannot register EJB 21 service endpoint interceptor: ", ex); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -22,22 +22,30 @@ package org.jboss.webservices.integration.invocation; import java.lang.reflect.Method; +import java.security.Principal; import javax.naming.Context; import javax.naming.NamingException; +import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServiceContext; import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.context.CurrentEJBContext; import org.jboss.webservices.integration.util.ASHelper; +import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext; import org.jboss.wsf.common.invocation.AbstractInvocationHandler; 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.integration.InvocationContextCallback; import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer; import org.jboss.wsf.spi.ioc.IoCContainerProxy; import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory; +import org.w3c.dom.Element; /** * Handles invocations on EJB3 endpoints. @@ -64,8 +72,6 @@ */ InvocationHandlerEJB3() { - super(); - final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class); this.iocContainer = iocContainerFactory.getContainer(); @@ -73,7 +79,7 @@ /** * Initializes EJB3 container name. - * + * * @param endpoint web service endpoint */ public void init(final Endpoint endpoint) @@ -88,7 +94,7 @@ /** * Gets EJB 3 container lazily. - * + * * @return EJB3 container */ private synchronized ServiceEndpointContainer getEjb3Container() @@ -109,7 +115,7 @@ /** * Invokes EJB 3 endpoint. - * + * * @param endpoint EJB 3 endpoint * @param wsInvocation web service invocation * @throws Exception if any error occurs @@ -119,6 +125,7 @@ try { // prepare for invocation + this.onBeforeInvocation(wsInvocation); final ServiceEndpointContainer ejbContainer = this.getEjb3Container(); final InvocationContextCallback invocationCallback = new EJB3InvocationContextCallback(wsInvocation); final Class<?> implClass = ejbContainer.getServiceImplementationClass(); @@ -135,26 +142,100 @@ this.log.error("Method invocation failed with exception: " + t.getMessage(), t); this.handleInvocationException(t); } + finally + { + this.onAfterInvocation(wsInvocation); + } } - + public Context getJNDIContext(final Endpoint ep) throws NamingException { - final EJBContainer ejb3Container = (EJBContainer)getEjb3Container(); - return (Context)ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX); + final EJBContainer ejb3Container = (EJBContainer) getEjb3Container(); + return (Context) ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX); } /** + * Injects webservice context on target bean. + * + * @param invocation current invocation + */ + @Override + public void onBeforeInvocation(final Invocation invocation) + { + final WebServiceContext wsContext = this.getWebServiceContext(invocation); + ThreadLocalAwareWebServiceContext.getInstance().setMessageContext(wsContext); + } + + /** + * Cleanups injected webservice context on target bean. + * + * @param invocation current invocation + */ + @Override + public void onAfterInvocation(final Invocation invocation) + { + ThreadLocalAwareWebServiceContext.getInstance().setMessageContext(null); + } + + /** + * Returns WebServiceContext associated with this invocation. + * + * @param invocation current invocation + * @return web service context or null if not available + */ + private WebServiceContext getWebServiceContext(final Invocation invocation) + { + final InvocationContext invocationContext = invocation.getInvocationContext(); + + return new WebServiceContextAdapter(invocationContext.getAttachment(WebServiceContext.class)); + } + + private static final class WebServiceContextAdapter implements WebServiceContext + { + private final WebServiceContext delegate; + + private WebServiceContextAdapter(final WebServiceContext delegate) + { + this.delegate = delegate; + } + + public MessageContext getMessageContext() + { + return this.delegate.getMessageContext(); + } + + public Principal getUserPrincipal() + { + return CurrentEJBContext.get().getCallerPrincipal(); + } + + public boolean isUserInRole(final String role) + { + return CurrentEJBContext.get().isCallerInRole(role); + } + + public EndpointReference getEndpointReference(final Element... referenceParameters) + { + return delegate.getEndpointReference(referenceParameters); + } + + public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) + { + return delegate.getEndpointReference(clazz, referenceParameters); + } + } + + /** * EJB3 invocation callback allowing EJB 3 beans to access Web Service invocation properties. */ private static final class EJB3InvocationContextCallback implements InvocationContextCallback { - /** WebService invocation. */ private Invocation wsInvocation; /** * Constructor. - * + * * @param wsInvocation delegee */ public EJB3InvocationContextCallback(final Invocation wsInvocation) @@ -164,7 +245,7 @@ /** * Retrieves attachment type from Web Service invocation context attachments. - * + * * @param <T> attachment type * @param attachmentType attachment class * @return attachment value @@ -173,7 +254,5 @@ { return this.wsInvocation.getInvocationContext().getAttachment(attachmentType); } - } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -35,7 +35,6 @@ */ public final class InvocationHandlerFactoryImpl extends InvocationHandlerFactory { - /** * Constructor. */ @@ -46,7 +45,7 @@ /** * Returns invocation handler associated with invocation type. - * + * * @param type invocation type * @return invocation handler */ @@ -80,5 +79,4 @@ return handler; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,7 +31,6 @@ */ final class InvocationHandlerMDB21 extends AbstractInvocationHandlerJSE { - /** * Constructor. */ @@ -39,5 +38,4 @@ { super(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,7 +31,6 @@ */ final class InvocationHandlerMDB3 extends AbstractInvocationHandlerJSE { - /** * Constructor. */ @@ -39,5 +38,4 @@ { super(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,16 +31,15 @@ /** * This Interceptor does the ws4ee handler processing on EJB 21 endpoints. - * + * * According to the ws4ee spec the handler logic must be invoked after the container - * applied method level security to the invocation. + * applied method level security to the invocation. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ final class ServiceEndpointInterceptorEJB21 extends AbstractInterceptor { - /** * Constructor. */ @@ -51,7 +50,7 @@ /** * Before and after we call the EJB 21 service endpoint bean, we process the handler chains. - * + * * @param jbossInvocation jboss invocation * @return ws invocation return value * @throws Exception if any error occurs @@ -120,5 +119,4 @@ throw ex; } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,7 +31,6 @@ */ public final class IoCContainerProxyFactoryImpl implements IoCContainerProxyFactory { - /** Container proxy singleton. */ private static final IoCContainerProxy CONTAINER = IoCContainerProxyImpl.getInstance(); @@ -45,12 +44,11 @@ /** * @see org.jboss.wsf.spi.ioc.IoCContainerProxyFactory#getContainer() - * + * * @return IoC container proxy */ public IoCContainerProxy getContainer() { return IoCContainerProxyFactoryImpl.CONTAINER; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -33,7 +33,6 @@ */ public final class IoCContainerProxyImpl implements IoCContainerProxy { - /** Singleton. */ private static final IoCContainerProxy SINGLETON = new IoCContainerProxyImpl(); /** JBoss MC kernel. */ @@ -46,7 +45,7 @@ { super(); } - + /** * Returns container proxy instance. * @@ -56,10 +55,10 @@ { return IoCContainerProxyImpl.SINGLETON; } - + /** * Sets JBoss kernel - invoked via MC injection. - * + * * @param kernel JBoss kernel */ public void setKernel(final Kernel kernel) @@ -84,5 +83,4 @@ return (T)ctx.getTarget(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -44,13 +44,12 @@ */ abstract class AbstractMetaDataBuilderEJB { - /** Logger. */ protected final Logger log = Logger.getLogger(this.getClass()); /** * Builds universal EJB meta data model that is AS agnostic. - * + * * @param dep webservice deployment * @return universal EJB meta data model */ @@ -68,7 +67,7 @@ /** * Template method for build enterprise beans meta data. - * + * * @param dep webservice deployment * @param ejbMetaData universal EJB meta data model */ @@ -82,7 +81,7 @@ * <li>config name</li> * <li>config file</li> * </ul> - * + * * @param dep webservice deployment * @param ejbArchiveMD universal EJB meta data model */ @@ -151,5 +150,4 @@ return false; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -35,7 +35,6 @@ */ public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect { - /** JSE meta data builder. */ private final MetaDataBuilderJSE metaDataBuilderJSE = new MetaDataBuilderJSE(); @@ -55,7 +54,7 @@ /** * Build container independent meta data. - * + * * @param dep webservice deployment */ @Override @@ -80,5 +79,4 @@ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -45,7 +45,6 @@ */ final class MetaDataBuilderEJB21 extends AbstractMetaDataBuilderEJB { - /** * Constructor. */ @@ -80,7 +79,7 @@ /** * Builds JBoss agnostic EJB meta data. - * + * * @param wsEjbsMD jboss agnostic EJBs meta data * @param jbossEjbMD jboss specific EJB meta data */ @@ -154,5 +153,4 @@ return null; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -46,7 +46,6 @@ */ final class MetaDataBuilderEJB3 extends AbstractMetaDataBuilderEJB { - /** * Constructor. */ @@ -57,7 +56,7 @@ /** * @see AbstractMetaDataBuilderEJB#buildEnterpriseBeansMetaData(Deployment, EJBArchiveMetaData) - * + * * @param dep webservice deployment * @param ejbArchiveMD EJB archive meta data */ @@ -77,7 +76,7 @@ /** * Builds JBoss agnostic EJB meta data. - * + * * @param wsEjbsMD jboss agnostic EJBs meta data * @param jbossEjbMD jboss specific EJB meta data */ @@ -142,7 +141,7 @@ /** * Returns activation config property value or null if not found. - * + * * @param name activation property name * @param activationConfigProperties activation config properties * @return activation config property value @@ -162,5 +161,4 @@ return null; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -51,14 +51,13 @@ import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; /** - * Builds container independent meta data from WEB container meta data. + * Builds container independent meta data from WEB container meta data. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ final class MetaDataBuilderJSE { - /** Logger. */ private final Logger log = Logger.getLogger(MetaDataBuilderJSE.class); @@ -72,7 +71,7 @@ /** * Builds universal JSE meta data model that is AS agnostic. - * + * * @param dep webservice deployment * @return universal JSE meta data model */ @@ -152,7 +151,7 @@ /** * Builds security meta data. - * + * * @param securityConstraintsMD security constraints meta data * @return universal JSE security meta data model */ @@ -181,7 +180,7 @@ /** * Sets web resources in universal meta data model. - * + * * @param jseSecurityMD universal JSE security meta data model * @param securityConstraintMD security constraint meta data */ @@ -203,7 +202,7 @@ /** * Returns servlet name to url pattern mappings. - * + * * @param jbossWebMD jboss web meta data * @return servlet name to url pattern mappings */ @@ -225,7 +224,7 @@ /** * Returns servlet name to servlet class mappings. - * + * * @param jbossWebMD jboss web meta data * @return servlet name to servlet mappings */ @@ -258,7 +257,7 @@ * If there's application.xml descriptor provided defining nested web module, * then context root defined there will be returned. * Otherwise context root defined in jboss-web.xml will be returned. - * + * * @param dep webservice deployment * @param jbossWebMD jboss web meta data * @return context root @@ -284,5 +283,4 @@ // prefer context root defined in application.xml over one defined in jboss-web.xml return contextRoot != null ? contextRoot : jbossWebMD.getContextRoot(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -33,13 +33,12 @@ */ final class PublishLocationAdapterImpl implements PublishLocationAdapter { - /** Webservice descriptions meta data. */ private final WebserviceDescriptionsMetaData wsDescriptionsMD; /** * Constructor. - * + * * @param wsDescriptionsMD webservice descriptions meta data */ PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescriptionsMD) @@ -51,7 +50,7 @@ /** * @see org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter#getWsdlPublishLocationByName(String) - * + * * @param endpointName endpoint name * @return publish location */ @@ -69,5 +68,4 @@ return null; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -31,17 +31,16 @@ import org.jboss.wsf.common.integration.AbstractDeploymentAspect; /** - * Generates JACC permissions. (This is temporary and really hacky solution). - * - * TODO: remove this deployment aspect and update - * particular JACC deployer to execute after - * JBossWS has modified web meta data. + * Generates JACC permissions. (This is temporary and really hacky solution). * + * TODO: remove this deployment aspect and update + * particular JACC deployer to execute after + * JBossWS has modified web meta data. + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect { - /** * Constructor. */ @@ -55,7 +54,7 @@ * does not go through the war security deployer. Hence the JACC * permissions are not created. There is a need to explicitly create * the war jacc permissions. - * + * * @param dep webservice deployment */ @Override @@ -78,5 +77,4 @@ throw new RuntimeException("Exception generating JACC perms: ", e); } } - } Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,67 @@ +/* + * 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.webservices.integration.security; + +import java.security.Key; +import java.security.KeyStore; +import java.util.Properties; + +import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptor; +import org.jboss.security.plugins.JaasSecurityDomain; + +/** + * Adapt JaasSecurityDomain to jbossws spi + * + * @author alessio.soldano(a)jboss.com + * @since 14-Dec-2010 + * + */ +public class JaasSecurityDomainAdaptorImpl implements JAASSecurityDomainAdaptor +{ + private JaasSecurityDomain delegate; + + public JaasSecurityDomainAdaptorImpl(JaasSecurityDomain delegate) + { + this.delegate = delegate; + } + + public KeyStore getKeyStore() + { + return delegate.getKeyStore(); + } + + public KeyStore getTrustStore() + { + return delegate.getTrustStore(); + } + + public Properties getAdditionalOptions() + { + return delegate.getAdditionalOptions(); + } + + public Key getKey(String alias, String serviceAuthToken) throws Exception + { + return delegate.getKey(alias, serviceAuthToken); + } + +} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,72 @@ +/* + * 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.webservices.integration.security; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.logging.Logger; +import org.jboss.security.plugins.JaasSecurityDomain; +import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptor; +import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver; + +/** + * Lookup JAASSecurityAdaptor from given JNDI location + * + * @author alessio.soldano(a)jboss.com + * @since 14-Dec-2010 + */ +public class JaasSecurityDomainAdaptorResolverImpl implements JAASSecurityDomainAdaptorResolver +{ + public JAASSecurityDomainAdaptor lookup(String jndi) throws Exception + { + InitialContext ic = null; + try + { + ic = new InitialContext(); + Object o = ic.lookup(jndi); + if (!(o instanceof JaasSecurityDomain)) + { + throw new Exception(jndi + " not bound to a JaasSecurityDomain but to a " + o.getClass().getName() + " instance"); + } + return new JaasSecurityDomainAdaptorImpl((JaasSecurityDomain)o); + } + catch (NamingException e) + { + throw new Exception("JNDI failure handling " + jndi, e); + } + finally + { + if (ic != null) + { + try + { + ic.close(); + } + catch (NamingException e) + { + Logger.getLogger(JaasSecurityDomainAdaptorImpl.class).warn(this + " failed to close InitialContext", e); + } + } + } + } +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -26,13 +26,12 @@ /** * Security adapters factory. - * + * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ public final class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory { - /** * Constructor. */ @@ -43,12 +42,11 @@ /** * Creates new security adapter instance. - * + * * @return security adapter */ public SecurityAdaptor newSecurityAdapter() { return new SecurityAdapterImpl(); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -40,7 +40,6 @@ */ final class SecurityAdapterImpl implements SecurityAdaptor { - /** * Constructor. */ @@ -51,7 +50,7 @@ /** * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#getPrincipal() - * + * * @return principal */ public Principal getPrincipal() @@ -61,7 +60,7 @@ /** * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#setPrincipal(Principal) - * + * * @param principal principal */ public void setPrincipal(final Principal principal) @@ -71,7 +70,7 @@ /** * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#getCredential() - * + * * @return credential */ public Object getCredential() @@ -81,7 +80,7 @@ /** * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#setCredential(Object) - * + * * @param credential credential */ public void setCredential(final Object credential) @@ -91,7 +90,7 @@ /** * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#pushSubjectContext(Subject, Principal, Object) - * + * * @param subject subject * @param principal principal * @param credential credential @@ -115,5 +114,4 @@ } }); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -36,7 +36,6 @@ */ abstract class AbstractSecurityMetaDataAccessorEJB implements SecurityMetaDataAccessorEJB { - /** JAAS JNDI prefix. */ private static final String JAAS_JNDI_PREFIX = "java:/jaas/"; @@ -126,5 +125,4 @@ return ejbMD != null ? ejbMD.getSecurityMetaData() : null; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -33,7 +33,6 @@ */ interface SecurityMetaDataAccessorEJB { - /** * Obtains security domain from EJB deployment. * @@ -73,5 +72,4 @@ * @return transport guarantee or null if not specified */ String getTransportGuarantee(Endpoint endpoint); - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -29,14 +29,13 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; /** - * Creates web app security meta data for EJB 21 deployment. + * Creates web app security meta data for EJB 21 deployment. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ final class SecurityMetaDataAccessorEJB21 extends AbstractSecurityMetaDataAccessorEJB { - /** * Constructor. */ @@ -71,5 +70,4 @@ return (assemblyDescriptorMD != null) ? assemblyDescriptorMD.getSecurityRoles() : null; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -43,7 +43,6 @@ */ final class SecurityMetaDataAccessorEJB3 extends AbstractSecurityMetaDataAccessorEJB { - /** * Constructor. */ @@ -152,8 +151,8 @@ /** * Gets <b>WebContext</b> if associated with EJB endpoint. - * - * @param endpoint EJB webservice endpoint + * + * @param endpoint EJB webservice endpoint * @return web context associated with EJB or null */ @SuppressWarnings( @@ -208,5 +207,4 @@ throw new IllegalStateException(errorMessage + firstDomain + secondDomain); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -26,14 +26,13 @@ import org.jboss.wsf.common.integration.AbstractDeploymentAspect; /** - * A deployment aspect that generates web app meta data for EJB endpoints. + * A deployment aspect that generates web app meta data for EJB endpoints. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect { - /** Web meta data creator. */ private WebMetaDataCreator webMetaDataCreator = new WebMetaDataCreator(); @@ -61,5 +60,4 @@ this.webMetaDataCreator.create(dep); } } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -46,7 +46,6 @@ */ final class WebMetaDataCreator { - /** Our Realm. */ private static final String EJB_WEBSERVICE_REALM = "EJBWebServiceEndpointServlet Realm"; @@ -78,7 +77,7 @@ JBossWebMetaData jbossWebMD = ASHelper.getOptionalAttachment(unit, JBossWebMetaData.class); if (jbossWebMD == null) { - jbossWebMD = new JBossWebMetaData(); + jbossWebMD = new JBossWebMetaData(); } this.createWebAppDescriptor(dep, jbossWebMD); @@ -368,5 +367,4 @@ return isJaxws ? this.ejb3SecurityAccessor : this.ejb21SecurityAccessor; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -45,7 +45,6 @@ */ final class WebMetaDataModifier { - /** Logger. */ private final Logger log = Logger.getLogger(WebMetaDataModifier.class); @@ -136,7 +135,7 @@ log.warn("Cannot get transport class name from " + WSConstants.STACK_TRANSPORT_CLASS_PROVIDER, e); } } - + if (transportClassName == null) { transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS); @@ -149,5 +148,4 @@ return transportClassName; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -32,7 +32,6 @@ */ public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect { - /** Web meta data modifier. */ private WebMetaDataModifier webMetaDataModifier = new WebMetaDataModifier(); @@ -55,5 +54,4 @@ this.log.debug("Modifying web meta data for webservice deployment: " + dep.getSimpleName()); this.webMetaDataModifier.modify(dep); } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -47,8 +47,7 @@ */ public final class ASHelper { - - /** + /** * EJB invocation property. */ public static final String CONTAINER_NAME = "org.jboss.wsf.spi.invocation.ContainerName"; @@ -231,7 +230,7 @@ /** * Returns true if EJB container is webservice endpoint. - * + * * @param ejbContainerAdapter EJB container adapter * @return true if EJB container is webservice endpoint, false otherwise */ @@ -258,7 +257,7 @@ /** * Returns servlet meta data for requested servlet name. - * + * * @param jbossWebMD jboss web meta data * @param servletName servlet name * @return servlet meta data @@ -310,12 +309,12 @@ } /** - * Returns required attachment value from deployment unit. - * + * Returns required attachment value from deployment unit. + * * @param <A> expected value * @param unit deployment unit * @param key attachment key - * @return required attachment + * @return required attachment * @throws IllegalStateException if attachment value is null */ public static <A> A getRequiredAttachment(final DeploymentUnit unit, final Class<A> key) @@ -332,11 +331,11 @@ /** * Returns optional attachment value from deployment unit or null if not bound. - * + * * @param <A> expected value * @param unit deployment unit * @param key attachment key - * @return optional attachment value or null + * @return optional attachment value or null */ public static <A> A getOptionalAttachment(final DeploymentUnit unit, final Class<A> key) { @@ -345,7 +344,7 @@ /** * Returns true if deployment unit have attachment value associated with the <b>key</b>. - * + * * @param unit deployment unit * @param key attachment key * @return true if contains attachment, false otherwise @@ -415,5 +414,4 @@ return endpoints; } - } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -47,7 +47,6 @@ */ public final class WebMetaDataHelper { - /** Star utility string. */ private static final String STAR_STRING = "*"; @@ -420,5 +419,4 @@ return paramMD; } - } Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservices.integration.weld; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.weld.integration.deployer.DeployersUtils; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * Weld deployment aspect that associates Weld Invocation handler + * if WS CDI integration is detected. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class WeldDeploymentAspect extends AbstractDeploymentAspect +{ + + public WeldDeploymentAspect() + { + // does nothing + } + + @Override + public void start(final Deployment dep) + { + if (!WSHelper.isJaxwsJseDeployment(dep)) + { + // we support weld integration for JAXWS JSE endpoints only + return; + } + + final DeploymentUnit deploymentUnit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class); + if (this.isWeldDeployment(deploymentUnit)) + { + for (final Endpoint endpoint : dep.getService().getEndpoints()) + { + endpoint.setInvocationHandler(new WeldInvocationHandler(endpoint.getInvocationHandler())); + } + } + } + + private boolean isWeldDeployment(final DeploymentUnit unit) + { + return unit.getAttachment(DeployersUtils.WELD_FILES) != null; + } + +} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.webservices.integration.weld; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper; +import org.jboss.weld.manager.api.WeldManager; +import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * Weld invocation handler. + * + * @author <a href="maito:ropalka@redhat.com">Richard Opalka</a> + * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a> + */ +public final class WeldInvocationHandler extends AbstractInvocationHandlerJSE +{ + + private static final String BEAN_MANAGER_JNDI_NAME = "java:comp/BeanManager"; + + private final InvocationHandler delegate; + + public WeldInvocationHandler(final InvocationHandler delegate) + { + this.delegate = delegate; + } + + @Override + public void onEndpointInstantiated(final Endpoint endpoint, final Invocation invocation) throws Exception + { + // handle Weld injections first + this.handleWeldInjection(invocation.getInvocationContext().getTargetBean()); + // handle JBossWS injections last and call @PostConstruct annotated methods + this.delegate.onEndpointInstantiated(endpoint, invocation); + } + + @Override + public void onBeforeInvocation(final Invocation invocation) throws Exception + { + this.delegate.onBeforeInvocation(invocation); + } + + @Override + public void onAfterInvocation(final Invocation invocation) throws Exception + { + this.delegate.onAfterInvocation(invocation); + } + + /** + * Handles weld injection. + * + * @param instance to operate upon + */ + private void handleWeldInjection(final Object instance) + { + try { + WeldManager beanManager = (WeldManager) new InitialContext().lookup(BEAN_MANAGER_JNDI_NAME); + NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, beanManager); + } catch (NamingException e) { + throw new IllegalStateException("Unable to locate BeanManager"); + } + } + +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-01-11 12:13:33 UTC (rev 13549) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-01-11 14:08:22 UTC (rev 13550) @@ -2,6 +2,18 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> + <!-- processes @WebServiceRef resources and their DD equivalents (EE.5.6 of Java EE6 spec) --> + <bean + name="org.jboss.switchboard.WebServiceRefResourceProvider" + class="org.jboss.webservices.integration.injection.ServiceRefResourceProvider" + /> + + <!-- processes @Resource annotated WebServiceContext beans (EE.5.6 of Java EE6 spec) --> + <bean + name="org.jboss.switchboard.WebServiceContextResourceProvider" + class="org.jboss.webservices.integration.injection.WebServiceContextResourceProvider" + /> + <!-- Wraps single instance of the kernel --> <bean name="WSIoCContainerProxy" class="org.jboss.webservices.integration.ioc.IoCContainerProxyImpl"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> @@ -49,13 +61,13 @@ <!-- deployers --> <bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer"> - <incallback method="setProcessor"/> + <incallback method="setParser"/> </bean> - + <bean name="JMSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.JMSDescriptorDeployer"> - <incallback method="setProcessor"/> + <incallback method="setParser"/> </bean> - + <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/> <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer"/> @@ -72,7 +84,7 @@ <incallback method="addDeployer"/> <uncallback method="removeDeployer"/> </bean> - + <!-- The AS specific deployment aspects --> <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.metadata.ContainerMetaDataDeploymentAspect"> <property name="provides">ContainerMetaData, VFSRoot</property> @@ -81,7 +93,7 @@ <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.webservices.integration.injection.InjectionMetaDataDeploymentAspect"> <property name="requires">WebMetaData</property> <property name="provides">InjectionMetaData</property> - <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property> + <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.ejbref.resolver.EjbReferenceResolver"/></property> </bean> <!-- TODO: remove this hacky aspect --> @@ -139,4 +151,9 @@ <property name="provides">WebMetaData</property> </bean> + <bean name="WSWeldDeploymentAspect" class="org.jboss.webservices.integration.weld.WeldDeploymentAspect"> + <property name="requires">StackEndpointHandler</property> + <property name="provides">CDIInjection</property> + </bean> + </deployment> Added: container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver 2011-01-11 14:08:22 UTC (rev 13550) @@ -0,0 +1 @@ +org.jboss.webservices.integration.security.JaasSecurityDomainAdaptorResolverImpl \ No newline at end of file