[jboss-cvs] JBossAS SVN: r101163 - in trunk: component-matrix and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 19 08:34:30 EST 2010
Author: alessio.soldano at jboss.com
Date: 2010-02-19 08:34:29 -0500 (Fri, 19 Feb 2010)
New Revision: 101163
Added:
trunk/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Removed:
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
trunk/webservices/build.xml
trunk/webservices/src/assembly/assembly-resources.xml
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2895] Merging from jaxrpc-cxf branch + moving to JBossWS-Native 3.3.0.Beta4
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/build/build.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -1734,6 +1734,7 @@
<antcall target="install-jbossws-to-endorsed" inheritRefs="true"/>
<antcall target="install-jbossws-to-deploy" inheritRefs="true"/>
<antcall target="install-jbossws-to-deployers" inheritRefs="true"/>
+ <antcall target="install-jbossws-jaxrpc-deployers" inheritRefs="true"/>
</target>
<target name="install-jbossws-to-endorsed">
@@ -1762,6 +1763,8 @@
<fileset refid="sun-fi:FastInfoset:jar"/>
<fileset refid="jboss.jaxbintros:jboss-jaxb-intros:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
<fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="org.apache.ws.policy:wscommons-policy:jar"/>
@@ -1772,12 +1775,24 @@
<unzip src="${org.jboss.ws.native:jbossws-native-resources:jar}"
dest="${webservices.module.output}/jbossws-native-resources"/>
<copy todir="${install.all.deployers}/jbossws.deployer">
- <fileset dir="${webservices.module.output}/jbossws-native-resources/resources/jbossws-jboss600/jbossws.beans">
+ <fileset dir="${webservices.module.output}/jbossws-native-resources/resources/jbossws-jboss601/jbossws.beans">
<include name="META-INF/**"/>
</fileset>
</copy>
</target>
+ <target name="install-jbossws-jaxrpc-deployers">
+ <!-- Install JBossWS jaxrpc deployers -->
+ <mkdir dir="${install.all.deployers}/jbossws-jaxrpc.deployer"/>
+ <unzip dest="${install.all.deployers}/jbossws-jaxrpc.deployer"
+ src="${webservices.module.output}/jboss-as-webservices-jbossws-jboss60-jaxrpc-deployer.zip"/>
+ <copy todir="${install.all.deployers}/jbossws-jaxrpc.deployer" flatten="true" overwrite="true">
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
+ <mapper refid="remove-versions" />
+ </copy>
+ </target>
+
<target name="module-webservices-all">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${webservices.module.name}"/>
@@ -1889,6 +1904,8 @@
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
<fileset refid="antlr:antlr:jar"/>
<fileset refid="commons-collections:commons-collections:jar"/>
@@ -2116,6 +2133,8 @@
<fileset refid="javax.jws:jsr181-api:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/build/pom.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -622,6 +622,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<optional>true</optional>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/component-matrix/pom.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -44,10 +44,10 @@
<version.jaxws.api>2.2</version.jaxws.api>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.9.0.GA</version.jboss.jbossts>
- <version.jboss.jbossws>3.3.0.Beta3</version.jboss.jbossws>
- <version.jboss.jbossws-common>1.3.0.Beta2</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.3.0.Beta2</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.3.0.Beta2</version.jboss.jbossws-spi>
+ <version.jboss.jbossws>3.3.0.Beta4</version.jboss.jbossws>
+ <version.jboss.jbossws-common>1.3.0.Beta3</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.3.0.Beta3</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-spi>1.3.0.Beta3</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.6.GA</version.jboss.messaging>
<version.jboss.web>3.0.0-beta-2</version.jboss.web>
@@ -935,6 +935,12 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ <version>${version.jboss.jbossws}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
<version>${version.jboss.jbossws}</version>
</dependency>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/testsuite/build.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -287,6 +287,7 @@
<fileset refid="org.jboss.ws.native:jbossws-native-management:war"/>
<fileset refid="org.jboss.ws.native:jbossws-native-resources:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/build.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -162,6 +162,13 @@
<include name="META-INF/stack-agnostic-jboss-beans.xml"/>
</fileset>
</zip>
+
+ <zip zipfile="${build.lib}/jbossws-jboss60-jaxrpc-deployer.zip">
+ <fileset dir="${build.resources}/jbossws-jaxrpc-jboss.deployer">
+ <include name="META-INF/stack-agnostic-jboss-beans.xml"/>
+ <include name="META-INF/jboss-classloading.xml"/>
+ </fileset>
+ </zip>
</target>
@@ -177,6 +184,9 @@
<!-- Build jbossws.deployer -->
<property name="jbossws.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"/>
<unzip dest="${jbossws.deployer.dir}" src="${build.lib}/jbossws-jboss60-deployer.zip"/>
+
+ <property name="jbossws-jaxrpc.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws-jaxrpc.deployer"/>
+ <unzip dest="${jbossws-jaxrpc.deployer.dir}" src="${build.lib}/jbossws-jboss60-jaxrpc-deployer.zip"/>
</target>
</project>
Modified: trunk/webservices/src/assembly/assembly-resources.xml
===================================================================
--- trunk/webservices/src/assembly/assembly-resources.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/assembly/assembly-resources.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -11,6 +11,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>jbossws-jboss.deployer/**</include>
+ <include>jbossws-jaxrpc-jboss.deployer/**</include>
<include>jbossws-jboss.jar/**</include>
</includes>
</fileSet>
Copied: trunk/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml (from rev 101109, branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml)
===================================================================
--- trunk/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml (rev 0)
+++ trunk/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>jbossws-jboss60-jaxrpc-deployer</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/jbossws-jaxrpc-jboss.deployer</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>META-INF/stack-agnostic-jboss-beans.xml</include>
+ <include>META-INF/jboss-classloading.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,52 @@
+/*
+ * 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.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * 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 at jboss.com
+ * @since 03-Feb-2010
+ *
+ */
+public class JAXRPCAppClientClassPathDeployer extends JAXRPCClientClassPathDeployer<ApplicationClientMetaData>
+{
+ public JAXRPCAppClientClassPathDeployer()
+ {
+ super(ApplicationClientMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ ApplicationClientMetaData applicationClientMetaData = ASHelper.getRequiredAttachment(unit, ApplicationClientMetaData.class);
+ return hasJaxRpcMappingReference(applicationClientMetaData.getServiceReferences());
+ }
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,64 @@
+/*
+ * 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.deployers;
+
+import java.util.Iterator;
+
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * 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 at jboss.com
+ * @since 03-Feb-2010
+ *
+ */
+public abstract class JAXRPCClientClassPathDeployer<T> extends JAXRPCIntegrationClassPathDeployer<T>
+{
+ public JAXRPCClientClassPathDeployer(Class<T> input)
+ {
+ super(input);
+ setInput(input); //makes the input mandatory instead of optional
+ }
+
+ protected static boolean hasJaxRpcMappingReference(ServiceReferencesMetaData serviceReferences)
+ {
+ if (serviceReferences != null)
+ {
+ for (Iterator<ServiceReferenceMetaData> it = serviceReferences.iterator(); it.hasNext();)
+ {
+ ServiceReferenceMetaData serviceReference = it.next();
+ if (serviceReference.getJaxrpcMappingFile() != null)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,68 @@
+/*
+ * 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.deployers;
+
+import java.util.Iterator;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * 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 at jboss.com
+ * @since 03-Feb-2010
+ *
+ */
+public class JAXRPCEjbClientClassPathDeployer extends JAXRPCClientClassPathDeployer<EjbJarMetaData>
+{
+ public JAXRPCEjbClientClassPathDeployer()
+ {
+ super(EjbJarMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ EjbJarMetaData ejbMetaData = ASHelper.getRequiredAttachment(unit, EjbJarMetaData.class);
+ EnterpriseBeansMetaData beansMetaData = ejbMetaData.getEnterpriseBeans();
+ if (beansMetaData != null)
+ {
+ for (Iterator<EnterpriseBeanMetaData> beanIt = beansMetaData.iterator(); beanIt.hasNext(); )
+ {
+ EnterpriseBeanMetaData beanMetaData = beanIt.next();
+ if (hasJaxRpcMappingReference(beanMetaData.getServiceReferences()))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,134 @@
+/*
+ * 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.deployers;
+
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.deployers.vfs.plugins.classloader.UrlIntegrationDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.util.StringPropertyReplacer;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.wsf.spi.management.ServerConfig;
+
+/**
+ * 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 at 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
+ protected boolean isIntegrationDeployment(VFSDeploymentUnit unit)
+ {
+ return stackRequiresIntegration && integrationLibsFound && isClassPathChangeRequired(unit);
+ }
+
+ @Override
+ public void start()
+ {
+ //NOOP
+ }
+
+ protected Set<URL> getJBossWSIntegrationUrls()
+ {
+ Set<URL> result = new HashSet<URL>();
+ try
+ {
+ for (String file : libs)
+ {
+ String url = getServerHome() + file;
+ url = StringPropertyReplacer.replaceProperties(url);
+ VirtualFile integrationLib = VFS.getRoot(new URL(url));
+
+ if (integrationLib != null && integrationLib.exists())
+ {
+ integrationLibsFound = true;
+ result.add(integrationLib.toURL());
+ }
+ else
+ {
+ log.debug("Could not find JAX-RPC integration lib: " + url);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Unexpected error: " + e);
+ }
+ return result;
+ }
+
+ /**
+ * Get server home.
+ *
+ * @return the jboss server home location
+ */
+ protected String getServerHome()
+ {
+ return "${jboss.server.home.url}";
+ }
+
+ public Set<String> getLibs()
+ {
+ return libs;
+ }
+
+ public void setLibs(Set<String> libs)
+ {
+ this.libs = libs;
+ setIntegrationURLs(getJBossWSIntegrationUrls());
+ }
+
+ public ServerConfig getWsServerConfig()
+ {
+ return wsServerConfig;
+ }
+
+ public void setWsServerConfig(ServerConfig wsServerConfig)
+ {
+ this.wsServerConfig = wsServerConfig;
+ //the Native stack does not requires the JAXRPC additional integration
+ stackRequiresIntegration = !wsServerConfig.getImplementationTitle().toLowerCase().contains("native");
+ }
+
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,60 @@
+/*
+ * 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.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * 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 at jboss.com
+ * @since 03-Feb-2010
+ *
+ */
+public class JAXRPCServerClassPathDeployer extends JAXRPCIntegrationClassPathDeployer<WebservicesMetaData>
+{
+ public JAXRPCServerClassPathDeployer()
+ {
+ super(WebservicesMetaData.class);
+ setInput(WebservicesMetaData.class); //makes the input mandatory instead of optional
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ WebservicesMetaData wsmd = ASHelper.getRequiredAttachment(unit, WebservicesMetaData.class);
+ WebserviceDescriptionMetaData[] descriptions = wsmd.getWebserviceDescriptions();
+ for (WebserviceDescriptionMetaData description : descriptions)
+ {
+ if (description.getJaxrpcMappingFile() != null)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,52 @@
+/*
+ * 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.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * 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 at jboss.com
+ * @since 03-Feb-2010
+ *
+ */
+public class JAXRPCServletClientClassPathDeployer extends JAXRPCClientClassPathDeployer<WebMetaData>
+{
+ public JAXRPCServletClientClassPathDeployer()
+ {
+ super(WebMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ WebMetaData webMetaData = ASHelper.getRequiredAttachment(unit, WebMetaData.class);
+ return hasJaxRpcMappingReference(webMetaData.getServiceReferences());
+ }
+}
Copied: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java (from rev 101109, branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java)
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java (rev 0)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,82 @@
+/*
+ * 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.deployers;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano at jboss.com
+ * @since 17-Feb-2010
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+}
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -45,7 +45,7 @@
/** Our deployers regitry. */
private final Map<DeploymentAspect, Deployer> deployersRegistry = new HashMap<DeploymentAspect, Deployer>();
-
+
/**
* Constructor.
*
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -104,7 +104,20 @@
{
this.log.debug(this.aspect + " start: " + unit.getName());
final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
- this.aspect.start(dep);
+ if (this.aspect.canHandle(dep))
+ {
+ //set the context classloader using the proper one from the deployment aspect
+ ClassLoader deployerClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(this.aspect.getLoader());
+ this.aspect.start(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(deployerClassLoader);
+ }
+ }
}
}
@@ -121,7 +134,20 @@
{
this.log.debug(this.aspect + " stop: " + unit.getName());
final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
- this.aspect.stop(dep);
+ if (this.aspect.canHandle(dep))
+ {
+ //set the context classloader using the proper one from the deployment aspect
+ ClassLoader deployerClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(this.aspect.getLoader());
+ this.aspect.stop(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(deployerClassLoader);
+ }
+ }
}
}
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -46,20 +46,20 @@
import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* Deployment aspect that builds injection meta data.
*
* @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
*/
-public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect
+public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** EJB 3 JNDI prefix. */
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -23,9 +23,9 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* An aspect that builds container independent meta data.
@@ -33,7 +33,7 @@
* @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler at redhat.com">Thomas Diesler</a>
*/
-public final class ContainerMetaDataDeploymentAspect extends DeploymentAspect
+public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** JSE meta data builder. */
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -28,7 +28,7 @@
import org.jboss.web.WebPermissionMapping;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* Generates JACC permissions. (This is temporary and really hacky solution).
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
*/
-public final class JACCPermissionsDeploymentAspect extends DeploymentAspect
+public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect
{
/**
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -23,7 +23,7 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
@@ -31,7 +31,7 @@
* @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler at redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataCreatingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data creator. */
Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-19 13:34:29 UTC (rev 101163)
@@ -22,7 +22,7 @@
package org.jboss.webservices.integration.tomcat;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* Modifies web meta data to configure webservice stack endpoints and properties.
@@ -30,7 +30,7 @@
* @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler at redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data modifier. */
Copied: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer (from rev 101109, branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer)
Copied: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF (from rev 101109, branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF)
Deleted: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml 2010-02-18 11:22:27 UTC (rev 101109)
+++ trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<classloading xmlns="urn:jboss:classloading:1.0"
- domain="JAXRPCDeployerDomain"
- parent-domain="DefaultDomain"
- export-all="NON_EMPTY"
- import-all="true">
-</classloading>
Copied: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml (from rev 101109, branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml)
===================================================================
--- trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml (rev 0)
+++ trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classloading xmlns="urn:jboss:classloading:1.0"
+ domain="JAXRPCDeployerDomain"
+ parent-domain="DefaultDomain"
+ export-all="NON_EMPTY"
+ import-all="true">
+</classloading>
Deleted: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-18 11:22:27 UTC (rev 101109)
+++ trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="JAXRPCAppClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCAppClientClassPathDeployer">
- <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCEjbClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCEjbClientClassPathDeployer">
- <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCServletClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServletClientClassPathDeployer">
- <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCServerClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServerClassPathDeployer">
- <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
-</deployment>
Copied: trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (from rev 101109, branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml)
===================================================================
--- trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ trunk/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="JAXRPCAppClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCAppClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCEjbClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCEjbClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServletClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServletClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServerClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServerClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+</deployment>
Modified: trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-19 13:19:39 UTC (rev 101162)
+++ trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-19 13:34:29 UTC (rev 101163)
@@ -72,7 +72,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>
More information about the jboss-cvs-commits
mailing list